merge conflict fix
test stuff and delete stuff
Merge branch 'master' of https://github.com/ggw215/twitter_master into bren_jeuel

Conflicts:
	app/controllers/index.rb
fixed merge conflicts
Merge pull request #6 from ggw215/bren_jeuel

Bren jeuel