Final Version 12/16/2013

This is the one that will be shown in class, it contains bug fixes, and
last minute additions to the game.