Merge pull request #26 from muddafudda/Colossus-dev

Merge pull request #25 from muddafudda/master
Merge pull request #27 from muddafudda/Colossus-dev

Colossus dev
Merge pull request #28 from muddafudda/Colossus-dev

Update main.cpp
Merge pull request #29 from muddafudda/master

Merge