Merge branch 'develop'
Undo
Merge branch 'develop'

Conflicts:
	Ball.cpp
	Paddle.cpp
	source/main.cpp
Commit to fix conflicts
Merge branch 'develop'
Merge branch 'develop'
Fix
Merge branch 'master' into develop