Pong 2.6

WORKSSSS!!!
Merge remote-tracking branch 'origin/develop'