...
Merge branch 'master' of https://github.com/NSLogTeam/od

Conflicts:
	GGoodStudy-master/.DS_Store
	GGoodStudy-master/GGoodStudy.xcodeproj/project.pbxproj
...