home page up
Merge branch 'master' of heroku.com:justanode

Conflicts:
	index.html
change to asynchronous io