updated with correct inflation calculations
Merge branch 'master' of https://github.com/dwolfand/SSAParser

Conflicts:
	app/scripts/parser.js