Merge pull request #1 from AugustanaCS285FALL14/master

Working version with basic functionality:  the player can move between