end of day css commit
Merge branch 'master' of github.com:kschmit90/TaskManagerProject

Conflicts:
	app/assets/stylesheets/global.css
	app/views/layouts/application.html.erb
	app/views/logins/new.html.erb
	app/views/pages/home.html.erb