Just moved code around
Merge branch 'master' of github.com:Seich/GAMEON2014
Merge branch 'master' of github.com:Seich/GAMEON2014