Merge pull request #30 from muddafudda/Colossus-dev

Merge pull request #29 from muddafudda/master
Update wallet.cpp
Update main.cpp
Update util.cpp
Update util.h
Merge pull request #31 from muddafudda/master

Merge