Styled subjects page
Merge branch 'master' of https://github.com/camcross/rafiki

Conflicts:
	app/views/tasks/show.html.erb