added phone to register_and_login test, added conditional validation to user model test for phone #
commented out Clinton's register_and_login test and password_resets_controller tests then no fails
Merge branch 'master' of https://github.com/rlconley/question_box into rlconley-master

Conflicts:
	db/schema.rb
fixed an issue with schema db difference Merge branch 'rlconley-master'