Merge branch 'master' into Jing
Added UI for photos

Added UI, supported files, and modified header file. Works.
Merge branch 'Jing'

Conflicts:
	TextbookExchange.xcodeproj/project.pbxproj