Merge branch 'master' of github.com:Mixmasterxp/Idle.js into gh-pages

Conflicts:
	index.htm
update
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.htm