heheehe
Merge branch 'master' of https://github.com/AprilLab/Dong-Nhi

Conflicts:
	Dong Nhi.xcodeproj/project.pbxproj
okie