Staging files before pulling commits from GiMac
Merge branch 'GiMac' of https://github.com/bacella/gauge into GiMac

Conflicts:
	Gauge/Gauge.xcodeproj/project.xcworkspace/xcuserdata/gianni.xcuserdatad/UserInterfaceState.xcuserstate