Ed functionality
Merge branch 'gh-pages' of github.com:zzmp/ed into gh-pages

Conflicts:
	js/main.js