Game is now a continuous loop instead of waiting for the user to enter commands
fixed merge conflict
committing small changes so I can get the new master
fixed merge conflict