Updated game and layout

It's pretty ugly and still rudimentary, but whatever.
Merge branch 'master' of https://github.com/Soleedus/CompSci-CCA