Merge branch 'master' of https://github.com/jesusnoseq/nodepong

Conflicts:
	app/public/pong.js