as done as its gonna get
Merge pull request #17 from ggw215/andra_jeuel

as done as its gonna get
Merge branch 'master' of https://github.com/ggw215/twitter_master into greg

Conflicts:
	app/views/_header.erb
	app/views/profile.erb
merge fixed