whaaaat?
still working on database
Merge branch 'master' into bren_jeuel
Merge pull request #7 from ggw215/bren_jeuel

Bren jeuel
Merge branch 'master' of https://github.com/ggw215/twitter_master into Andra-Eiko

Conflicts:
	app/controllers/index.rb
fixed conflicts