migrated location
Merge pull request #2 from yudai-ushiro/user_logout

migrated location
Merge pull request #3 from yudai-ushiro/favorite

add tweet feature
Merge branch 'master' of https://github.com/yudai-ushiro/six into new

Conflicts:
	db/schema.rb