Messing with maps and stuff
Merge branch 'master' of https://github.com/cgelon/GamesCapstone