fix bugs
Collision detection added
Merge remote-tracking branch 'origin/master'

Conflicts:
	JetpackSoftUni/jetpack.js