Integrating map loading
Fixed conflict
Merge branch 'master' of https://github.com/arlomdev/vgdc-gamejam-october
fixing stuff!!