removed binding.pry from metrics controller
Merge branch 'master' into css

Conflicts:
	app/controllers/metrics_controller.rb