Orange potion panel change
+

Conflicts:
	game/project.greenfoot
Merge branch 'master' of https://github.com/cwarne/cpe-123