Playing with css/layout
CSSing
WIP
Merge branch 'master' of github.com:heathered/task-project into heather

Conflicts:
	app/views/tasks/show.html.erb
Fixed variable bug