Merge branch 'master' of https://github.com/Jamil/PhotoNotes

Conflicts:
	PhotoNotes.xcodeproj/project.pbxproj

PhotoNotes.xcodeproj/project.xcworkspace/xcshareddata/PhotoNotes.xccheck
out
	PhotoNotes/Base.lproj/Main_iPhone.storyboard
	PhotoNotes/MasterViewController.h
	PhotoNotes/MasterViewController.m
	PhotoNotes/Tesseract.mm