made stuff
Merge branch 'local-edit'

Conflicts:
	index.html