연동?
Merge branch 'master' of https://github.com/Nexters/House.Android.git

Conflicts:
	House/src/com/nexters/house/activity/InteriorWrite2Activity.java