Merge branch 'master' of github.com:tommc1985/html5-athletics-game

Conflicts:
	images/scenery/crowd/crowd-1.png
	images/scenery/ground/track.png
	images/scenery/sky/blue-sky.png
Merge branch 'master' of github.com:tommc1985/html5-athletics-game