minor changes
Merge branch 'master' of https://github.com/GearChicken/MINX_PONG

Conflicts:
	Pong.cpp
	Pong.cpp~
	pong