basic twitter status display
add oembed
Add Facebook OAuth2.  Removed account_path and replaced with user_path.
basic display for facebook statuses
update development.rb.sample for facebook
finished rebasing
with a profile picture
gemfile.lock change
Merge branch 'facebook' into feed_status
Merge branch 'twitter' into feed_status

Conflicts:
	app/models/user.rb
	app/views/users/show.html.erb
styling
basic feed view
Changing Route For Sanity

  - Also removed some puts
Merge branch 'development' into feed_status

Conflicts:
	Gemfile.lock
	app/models/authorization.rb
	config/environments/development.rb.sample