some live fixes
changed hostname
Merge branch 'master' of github.com:sspringer82/html5workshop

Conflicts:
	js/init.js