At home
Merge branch 'master' of https://github.com/SamuelTeng/taichungdiving

Conflicts:
	taichungdiving.xcodeproj/project.pbxproj
	taichungdiving/DiveLog.h
	taichungdiving/DiveLog.m

taichungdiving/taichungdiving.xcdatamodeld/taichungdiving.xcdatamodel/co
ntents