무슨작업인지 기억이 안
Merge branch 'develop' of https://github.com/miniminihouse/miniminihouse.github.io into develop

Conflicts:
	app/styles/sass/main.scss
Merge branch 'develop' of https://github.com/miniminihouse/miniminihouse.github.io into develop