Added Test.java, changed game.java

Added input and parsing to game()
Merge branch 'JeffBranch'
Merge branch 'master' of https://github.com/macbarron/TextBasedGame