minor changes
Merge branch 'master' of github.com:vitxd/Pong

Conflicts:
	js/ball.js
	js/player.js
	js/pong.js