Added some stuff
Merge pull request #1 from jwilner/master

Starting to add basic gameplay functions