Started to implement y velocity
Merge branch 'master' of https://github.com/tanishalfelven/platformer

Conflicts:
	entity.py