배경+건물 추가
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	script.js