added edit and delete
Merge branch 'master' of https://github.com/ClareCat/Mixt.

Conflicts:
	views.py