Changes to bump map collision

Kim can now be resized, still not perfect.
Merge branch 'Sebastian'

Conflicts:
	grief/grief/map.txt