fixes #11
fixes #2
Changed text in controller
Merge branch 'master' of github.com:skateboard/pong-prototype