Merge branch 'map'
Merge branch 'master' of https://github.com/torijule/INFO343Final