updating graphs, css, controllers, views
merge

Conflicts:
	Above_Average/app/views/recyclings/new.html.erb
	Above_Average/app/views/users/show.html.erb