Added maps
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Model/Obstacles/ObstaclePillar.java
	src/View/MainView.java
New maps