Octotypes
Merge remote-tracking branch 'origin/Octotypes' into eyeCorners

Conflicts:
	iSee.xcodeproj/project.pbxproj
	iSee/SettingsViewController.m
	iSee/Storyboard.storyboard
	iSee/ViewController.m