rebuilding
Merge branch 'master' of https://github.com/smithdodo/Pacman_rebuid

Conflicts:
	src/de/tu_darmstadt/gdi1/pacman/model/PowerUp.java
	src/de/tu_darmstadt/gdi1/pacman/model/SpecialItem.java
	src/de/tu_darmstadt/gdi1/pacman/model/SpeedUp.java