Moving blocks
Merge branch 'master' of github.com:atamon/pong

Conflicts:
	scripts/main.js