can now remove items from tasklist
Merge branch 'master' of https://github.com/JP-x/hackathon-2 into johnny

Conflicts:
	static/js/controllers.js