implement delete and edit page and only show content.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md