Updated about and some calculation stuff
Merge branch 'master' of https://github.com/swingchef/FinancialCalculator

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