update
update
code working--test need work
gemfile fixed
gem file = good :smile:, cucumber test all passing :satisfied:
update
update
Everything = good state
update
merge fixes
Merge remote-tracking branch 'upstream/master'
everything finally fixed, phan.js SKIPPED
All test passing and feature working
updates fixed01
Merge branch 'master' of github.com:Arielle919/nss-squawker-1 into Arielle919-master

* 'master' of github.com:Arielle919/nss-squawker-1:
  updates fixed01
  All test passing and feature working
  everything finally fixed, phan.js SKIPPED
  update
  Everything = good state
  update
  gem file = good :smile:, cucumber test all passing :satisfied:
  code working--test need work
  update

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/application.rb
	db/schema.rb