settings - skin, profile 사진
drawer - skin, profile 사진
Merge branch 'master' of https://github.com/MentoSchool/skincare.git

Conflicts:
	Collage_SkinCare/src/com/collage/skincare/ActMain.java