docent crash if no error
Merge branch 'dudeWoah' into Developer-Branch

Conflicts:
	FitTogether/FitTogether/Base.lproj/Main.storyboard