충돌
Merge branch 'master' of https://github.com/junseol86/Akadev.git

Conflicts:
	OneRoomHandongi/bin/AndroidManifest.xml