Merge branch 'master' into gh-pages
updated MyZone + Intro game

Updated js+css and added/removed images
Merge branch 'gh-pages'

Conflicts:
	javascript/parse.js