コードを整理
Merge branch 'master' of https://github.com/azumatoshimitsu/skeleton

Conflicts:
	css/style.css