Differential Changes
Merge branch 'master' of https://github.com/ishg/HTML5Game

Conflicts:
	js/script2.js
	style.css