更新内容が不明。多分削除OK
Merge branch 'master' of https://github.com/keisuke322/parkitweb

Conflicts:
	css/style.css