Added facebook ID and secret. More progress made towards facebook authentication.
Further progress with integration of facebook login.
init
Added activerecord-postgresql-adapter to gemfile
Added pg gem, trying to get it to run on heroku
Installed 'pg'
Got basic developer login functionality working.
Can login to facebook through localhost.
added user create feature definition
user registration without facebook account
minor bug fixes
Failed registration fixes
Added step definition folder to user_login branch
Added new scenario for login
facebook login image and link added
Merge branch 'user_login' of github.com:aaronjosephs/BTV_project into user_login
Fixed crash that occurred when using invalid login info.
Passwords must now be between 8 and 32 characters.
Changed password verification requirements to include length between 8 and 32 characters and must contain at least one letter and at least one digit
Merge branch 'user_login'

Conflicts:
	Gemfile.lock
	Gemfile~
	app/models/user.rb
	config/routes.rb
	db/schema.rb
	features/step_definitions/web_steps.rb
One more merge change