Accidently lost a commit. Fixed errors

Fixed the bugs of the missing commit. which means this is exactly the
same as commit 8.
Merge branch 'master' of https://github.com/MediocreLogic/SpacePong