Update
Update
Merge pull request #2 from Cannacoin-Project/master

Master