profile stuff done
Merge branch 'master' into profile

Conflicts:
	app/controllers/twitter_controller.rb
	app/views/feed.erb
	app/views/profile.erb
Merge pull request #21 from euglazer/profile

profile stuff done