worked on finishing css
Merge branch 'master' into css

Conflicts:
	app/assets/stylesheets/welcome.css
	app/views/groups/show.html.erb
Merge branch 'master' into css
styled metrics controller
Merge branch 'master' into css

Conflicts:
	app/controllers/metrics_controller.rb
Merge pull request #39 from zrivest/css

Css