Add New editor
Merge branch 'edit'

Conflicts:
	edit.html
Add Editor script
Merge branch 'master' of github.com:iegik/iegik.github.com
Merge branch 'edit'