[+] Reset of the ball when it hit a projectile
Merge branch 'master' of https://github.com/kbrivois/ROLL-IT

Conflicts:
	js/app.js