add user and bicycle creation
Merge branch 'master' of https://github.com/epicodus/stolen-bicycle-registry into user-registration

Conflicts:
	app/controllers/bicycles_controller.rb
	config/routes.rb
	spec/factories.rb