gems
Merge branch 'master' of https://github.com/ggw215/twitter_master

Conflicts:
	app/controllers/index.rb
postroutes for signin n out
Merge pull request #1 from ggw215/bren_jeuel

Bren jeuel