factories being added
factory for users
factories updated to help pass the first test
mergeMerge branch 'user_list' into user_sign_up

Conflicts:
	Gemfile.lock
user sign up pass