DelayedClaimable contract with test added

Renamed DelayedClaimable function and modifier

contracts/Claimable.sol

@@ -1,6 +1,10 @@
+<<<<<<< HEAD
 pragma solidity ^0.4.0;
 
 
+=======
+pragma solidity ^0.4.4;
+>>>>>>> 0aa4d02... DelayedClaimable contract with test added
 import './Ownable.sol';