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
Merge branch 'master' of https://github.com/ggw215/twitter_master into Andra-Eiko

Conflicts:
	app/controllers/index.rb
	app/views/sign_up.erb
minor changes to profile postr
controller update
Merge pull request #3 from ggw215/bren_jeuel

Bren jeuel
layout, login, sign up views updated
Merge branch 'master' of https://github.com/ggw215/twitter_master into Andra-Eiko

Conflicts:
	app/controllers/index.rb
fixed merge conflicts