Second attempt at updating collision and stoof

You don't heff to be mad.
Merge remote-tracking branch 'origin/RicardoKKKKKKKKKKKKK'

Conflicts:
	Squishy/World.cpp
	Squishy/main.cpp