Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into jerryjackexample
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into jerryjackexample
new map
Merge pull request #61 from duke-compsci308-spring2013/jerryjackexample

Merging our game into master. Extends game engine and controller by offering selection of maps, number of players, and game mode