added stuff
 added stuff
 added stuff
Merge branch 'master' of https://github.com/gskielian/CodeCraft
 added stuff