fixes
Merge branch 'master' of https://github.com/MartyPye/iphoneAss2

Conflicts:
	iCalc/iCalc/ViewController.m