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

Conflicts:
	bin/de/tu_darmstadt/gdi1/pacman/model/Player.class
	src/de/tu_darmstadt/gdi1/pacman/model/Moveable.java
	src/de/tu_darmstadt/gdi1/pacman/model/Player.java