merged branches attempt
Merge branch 'master' of https://github.com/RedMadRobot/baker

Conflicts:
	Baker.xcodeproj/project.pbxproj

Baker.xcworkspace/xcuserdata/mcmurphy.xcuserdatad/UserInterfaceState.xcu
serstate
	BakerView/BakerViewController.h

Pods/Pods.xcodeproj/xcuserdata/mcmurphy.xcuserdatad/xcschemes/xcschemema
nagement.plist