made a style change to the code
Merge branch 'master' of https://github.com/gobluewolverine5/Wicked-Calc

Conflicts:
	fractionCalc/en.lproj/MainStoryboard_iPad.storyboard
made a style change to the code
merging
merging