不具合の修正
no message
Merge branch 'facebook'

Conflicts:
	app/views/users/no_one.html.erb
fixed conflict
Merge branch 'master' of https://github.com/yudai-ushiro/six into test

Conflicts:
	app/controllers/about_controller.rb
	app/controllers/relationships_controller.rb
	app/views/users/index.html.erb
	app/views/users/no_one.html.erb
	app/views/videos/_video.html.erb
	config/routes.rb
Merge pull request #28 from yudai-ushiro/test

Test