DD
Merge branch 'master' of https://github.com/kimhyein/Iam-your-father

Conflicts:
	app/src/main/AndroidManifest.xml
푸쉬푸쉬~!
dddddd
액티비티 전환 기본
123