Merge pull request #5 from irazorx1/master

Final blah
Merge pull request #6 from irazorx1/basic-game

Merge pull request #5 from irazorx1/master