Deletion

doesn't work yet..
Merge remote-tracking branch 'origin/master'

Conflicts:
	blarg.db
	blarg.py
Merge branch 'master' of https://github.com/samconnolly/Blarg