setting up pong field
merge Merge branch 'master' of https://github.com/paulmakl/CS315-Final

Conflicts:
	cs315_hwk5_webgl/gameJS/Breakout.js