jawn
Merge branch 'master' of https://github.com/yasabere/pongInfinity

Conflicts:
	server/public/js/app.controllers.js