Merge pull request #1 from AugustanaCS285FALL14/master

Working version with basic functionality:  the player can move between
Merge pull request #1 from AugustanaCS285FALL14/master

Working version with basic functionality:  the player can move between
created textUI and created graphicUI class
Merge pull request #2 from AugustanaCS285FALL14/master

Initial work on supporting items... (not working yet, but we've got an
Merge pull request #2 from AugustanaCS285FALL14/master

Initial work on supporting items... (not working yet, but we've got an
refactored Choices and made them use inheritance (maybe too much!)
Merge pull request #3 from myolin/master

Overhauled Choice architecture
Continued work on Item superclass as well as some specific items
Merge pull request #1 from youstoledan/master

TextUI now working!