edits
Merge branch 'master' of https://github.com/rowlandking/TaskBook

Conflicts:
	models.js