Resize Graph
Adjustment

Conflicts:
	app/assets/javascripts/calculation.js