Attempting to fix nil values on graphs
Merge branch 'master' of github.com:duffcodester/digiquatics

Conflicts:
	app/controllers/static_pages_controller.rb