Merge pull request #9 from muddafudda/master

Pull
Update main.cpp
Merge pull request #10 from muddafudda/Colossus-dev

Colossus dev