its starting to look like pong
Merge branch 'master' of https://github.com/marioluigiman/Pong

Conflicts:
	pong_code/index.html

git message