nothing changed
Merge branch 'master' of github.com:Nexters/House.Android

Conflicts:
	House/src/com/nexters/house/activity/InteriorWrite2Activity.java
카메라롤 디자인 완성
카메라롤 디자인가안 완성,미리보기 일부완성