Merge branch 'master' into fix/docs

docs/source/bounty.rst

@@ -7,14 +7,14 @@ To create a bounty for your contract, inherit from the base `Bounty` contract an
 	import "./YourContract.sol";
 
 	contract YourBounty is Bounty {
-	function deployContract() internal returns(address) {
-	return new YourContract()
+	  function deployContract() internal returns(address) {
+	    return new YourContract()
 	  }
 	}
 
 
 Next, implement invariant logic into your smart contract.
-Your main contract should inherit from the Target class and implement the checkInvariant method. This is a function that should check everything your contract assumes to be true all the time. If this function returns false, it means your contract was broken in some way and is in an inconsistent state. This is what security researchers will try to acomplish when trying to get the bounty.
+Your main contract should inherit from the `Target` class and implement the ```checkInvariant()``` method. This is a function that should check everything your contract assumes to be true all the time. If this function returns false, it means your contract was broken in some way and is in an inconsistent state. This is what security researchers will try to acomplish when trying to get the bounty.
 
 At contracts/YourContract.sol::
 
@@ -35,7 +35,7 @@ At ```migrations/2_deploy_contracts.js```::
 	  deployer.deploy(YourBounty);
 	};
 
-Next, add a reward to the bounty contract
+Next, add a reward to the bounty contract.
 
 After deploying the contract, send reward funds into the bounty contract.
 

docs/source/ecrecovery.rst

@@ -1,7 +1,7 @@
-ECReovery
+ECRecovery
 =============================================
 
-Returns the signer of the the hash using the signature divided in v, r, and s values.
+Returns the signer of the hash using the signature divided in v, r, and s values.
 
 recover(bytes32 hash, bytes sig) internal returns (address)
 """""""""""""""""""""""""""""""""""""""""""""""""

docs/source/getting-started.rst

@@ -9,6 +9,7 @@ OpenZeppelin integrates with `Truffle <https://github.com/ConsenSys/truffle/>`_,
 
 To install the OpenZeppelin library, run::
 
+	npm init # follow instructions
 	npm install zeppelin-solidity
 
 	# If you are using yarn, add dependency like this -