一旦あげ！スタイルとか変更
Merge commit '30e5586b26186783e88bac4e5a7385db59ce252a'

Conflicts:
	views/index.jade
	views/layout.jade