Added a bunch but I'm crashing
Ugh
Merge branch 'master' of https://github.com/nredman/Assym-game