add money_calc addition and unit tests for
Merge branch 'master' into money_trial

Conflicts:
	money.hpp