editing tasks
Merge branch 'master' into signup

Conflicts:
	db.sqlite3