minor changes to game logic
Conflicts resolved
Merge pull request #22 from otorres86/master

minor game logic changes