Navbar color malfunction
Navbar css fixed
Users controller
Merge branch 'static-pages'

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb