Försökt göra tilemap
Merge branch 'master' of https://github.com/EmmaEdv/funkypogys into Ingelhag

Conflicts:
	pogygame/test/GUI.js
	pogygame/test/LevelOne.js
	pogygame/test/assets/tiles.png
Ny level med ny tilemap
Merge with Ingelhag