Fixing Conflicts
Merge branch 'master' of https://github.com/nguyenshane/Power-Pong