Fixed class definitions inside cpp files
Merge branch 'develop'

Conflicts:
	Ball.cpp
	Paddle.cpp
	source/main.cpp
Commit to fix conflicts