Passing to Marcus
Merge branch 'master' of github.com:MarcusHSmith/Journaler into HEAD

Conflicts:
	Journaler.xcodeproj/project.xcworkspace/xcuserdata/Marcus.xcuserdatad/UserInterfaceState.xcuserstate
	ScaryBugs/MSDetailViewController.m
Github problems :(
Edits to Photo save in cloud