fixed colliding from below (maybe)
Merge branch 'master' of https://github.com/Slokken/Risseproto

Conflicts:
	Risseproto/Risseproto/Controller.cs
	Risseproto/Risseproto/Gameobject.cs