new twitter login feature cuke file
fixed twitter authorization feature story
sign in with twitter functioning----test tweaks to come
adding feature file
pass tests for twitter authentication
alphabetize gems, cleaning user model
upstream merge conflict unresolvable and irreconsabvle
deleted excess comments
hiding twitter keys using figaro gem
added example yml file and instructions in readme
fixing readme link
tweaking readme link
tweaking readme link again
added example to application.yml.example
made twitter yml example file more explicit
Merge branch 'master' of github.com:peoplespete/nss-squawker into peoplespete-master

* 'master' of github.com:peoplespete/nss-squawker:
  made twitter yml example file more explicit
  added example to application.yml.example
  tweaking readme link again
  tweaking readme link
  fixing readme link
  added example yml file and instructions in readme
  hiding twitter keys using figaro gem
  deleted excess comments
  alphabetize gems, cleaning user model
  pass tests for twitter authentication
  adding feature file
  sign in with twitter functioning----test tweaks to come
  fixed twitter authorization feature story
  new twitter login feature cuke file

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/models/user.rb
	config/application.rb
	config/routes.rb
	db/schema.rb
	features/user_profiles.feature