added collision with tiles, jumping improved
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/map.txt