Minor Adjustment to Graph code
Conflict Adjust

Conflicts:
	app/views/calculation/calculate.html.erb