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

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/at/accountbook/MyActivity.java
	app/src/main/res/layout/activity_my.xml
modify