Map creation
Merge branch 'master' of https://github.com/Lord-Nazdar/Global-Game-Jam

Conflicts:
	src/fileLoader.js
	src/main.js