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

Conflicts:
	app.js
	public/js/taskbook.js