家分
Merge branch 'master' of https://github.com/kaepa3/ruby_Lerning

Conflicts:
	201406_rails/tokuninasi/app/controllers/tweet_controller.rb
	201406_rails/tokuninasi/app/views/tweet/new.html.erb
	201406_rails/tokuninasi/config/routes.rb
	201406_rails/tokuninasi/db/schema.rb