jaja
animations, ball logic
Merge commit 'c4871c67' into HEAD

Conflicts:
	index.html