some comments added
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/calculations.txt