Updates
Merge pull request #1 from Cannacoin-Project/master

Updates