started calculations
added macro calculator
Merge branch 'master' of https://github.com/pmatthen/IFOnly

Conflicts:
	IFOnly.xcworkspace/xcshareddata/IFOnly.xccheckout