mapmodel
Merge branch 'features' of https://github.com/smithdodo/Pacman into features

Conflicts:
	src/de/tu_darmstadt/gdi1/pacman/model/MapModel.java