CSS TWEAKS
Routes update
created new activities
Merge branch 'master' into cburkley
CSS WIP
fixed spacing on all files except views
 WIP
fixed a tiny error in task.create
Merge branch 'master' into mtaylor

Conflicts:
	app/controllers/tasks_controller.rb
fixed login/logout on nav bar
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into katie

Conflicts:
	app/controllers/tasks_controller.rb
	app/controllers/users_controller.rb
	app/models/task.rb
	app/views/layouts/application.html.erb
Merge branch 'master' into cburkley
fixed merge conflicts
fixin' up before pulling master
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into cburkley

Conflicts:
	app/views/layouts/application.html.erb
fixed merge conflicts
Merge conflict