Knockback, heatlth, reset on death, reorganizeLVL
Merge remote-tracking branch 'origin/master'

Conflicts:
	Forest.java
	Levels.java
	Olaf.java
	project.greenfoot