Fixing bad commit

Apparently Git allows you to commit files that are still in a conflicted
state....... not good.
Merge branch 'master' of https://github.com/orthros/Pong

Conflicts:
	Pong/GameObjects/Walls/Wall.cs