working with floats
Merge branch 'master' of github.com:cam25/ObjectiveC into gh-pages

Conflicts:
	CamApp/CamApp.xcodeproj/project.xcworkspace/xcuserdata/cameronmozie.xcuserdatad/UserInterfaceState.xcuserstate