Finished draft of Chart.cshtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	Civionics.v12.suo