squished bugs and added game logic
Merge remote-tracking branch 'origin/Cameron' into Cameron