changed cucumber tests, each step either has definition in web_steps or index_steps, not fully implemented
Merge branch 'stephbranch' of github.com:lewisren/FuelEd into stephbranch
changed cucumber tests, each step either has definition in web_steps or index_steps, not fully implemented
added cucumber and rspec folders, updated gemfile to do the stuff
Merge branch 'stephbranch' of https://github.com/lewisren/FuelEd into stephbranch
created spec files for user and appt controllers and models, in process of filling them in
changed cucumber tests, each step either has definition in web_steps or index_steps, not fully implemented
added cucumber and rspec folders, updated gemfile to do the stuff
created spec files for user and appt controllers and models, in process of filling them in
made homepage redirect to users/index.html.erb.  still trying to figure out the damn tests
Merge branch 'stephbranch' of https://github.com/lewisren/FuelEd into stephbranch

Conflicts:
	app/views/index/login2.html.erb
	app/views/users/index.html.erb
	app/views/users/login2.html.erb
	config/routes.rb
	db/schema.rb
	spec/controllers/appointments_controller_spec.rb
	spec/controllers/users_controller_spec.rb
	spec/models/appointments_model_spec.rb
Introduced Omniauth controllers/routes/gems and updated user model
Introduced Omniauth controllers/routes/gems and updated user model
merging  with origin
updated appointments cucumber tests, added a path
changed cucumber tests, each step either has definition in web_steps or index_steps, not fully implemented
added cucumber and rspec folders, updated gemfile to do the stuff
created spec files for user and appt controllers and models, in process of filling them in
made homepage redirect to users/index.html.erb.  still trying to figure out the damn tests
updated appointments cucumber tests, added a path