* Created Level in MapLoader.java
Merge branch 'master' of https://github.com/Timalkemade/playful-octo-bear

Conflicts:
	src/main/java/nl/sest/gamejam/controller/MapLoader.java
Fixed merge