Cleaned up code
Merge branch 'master' of https://github.com/a-shen/task

Conflicts:
	Task/Views.hs
	Task/Views.o
	static/js/tasks.js