device機能の追加
facebook認証の完成
Merge branch 'master' of https://github.com/yudai-ushiro/six into facebook

Conflicts:
	app/views/layouts/_header.html.erb
Merge pull request #19 from yudai-ushiro/facebook

Facebook