Added core game
Merge branch 'dev' of https://github.com/stevenhillcox/Grad-Project-2014
Merge branch 'master' into dev