locationモジュールを途中まで実装
Merge remote-tracking branch 'origin/yusuke_dev' into ui

Conflicts:
	css/style.css
merged location
added sounds