edit and delete
Merge branch 'master' of https://github.com/fanghuang/Booksharepoint

Conflicts:
	static/css/main.css
	templates/forsale.html
	templates/index.html