Checking in first version of regex
Merge branch 'master' of https://github.com/startuphokie/bargainburg.backend into format
regex for phone number formatting
regular expression for phone number
authorization error for printing merchant
Merge branch 'master' of github.com:startuphokie/bargainburg.backend into format

Conflicts:
	db/schema.rb
	lib/tasks/populate.rake
Remove except from load_and_authorize_resource in merchant_controller
Merge branch 'master' of https://github.com/startuphokie/bargainburg.backend into format
phone number format check
Merge branch 'master' of https://github.com/startuphokie/bargainburg.backend into format
Merge branch 'format' into validation

Conflicts:
	db/schema.rb
Merge branch 'validation' of https://github.com/startuphokie/bargainburg.backend into validation

:a

Conflicts:
	Gemfile.lock
moved phone number format validations to model
Merge branch 'validation' into format

Conflicts:
	app/models/merchant.rb
updated format branch
Merge branch 'master' of https://github.com/startuphokie/bargainburg.backend into format

Conflicts:
	Gemfile.lock
	app/controllers/merchants_controller.rb
	app/models/merchant.rb
finished merging
fixed previous merge
still fixing failed merge
Merge pull request #57 from startuphokie/format

Format