CSS stuff
Merge branch 'master' of https://github.com/a-shen/task

Conflicts:
	Task/Views.o
	static/css/task.css