Merge lines.
Merge pull request #50 from JunichiIto/convert-to-slim

[要確認] ERBをSlimにコンバート
Merge pull request #51 from JunichiIto/install-devise

Deviseでログイン管理するように変更
Merge remote-tracking branch 'upstream/master' into refactoring-20141221

Conflicts:
	app/views/layouts/application.html.slim