changed hosts
Merge branch 'master' of https://github.com/stucco/bookmarklet

Conflicts:
	public/index.html
	public/modalForm.js