ebook reader
Merge branch 'master' of https://github.com/Eric1254/Teevo

Conflicts:
	Teevo.xcodeproj/project.pbxproj
	Teevo/TeevoCommon.h