Added Devise users.
Merge branch 'AddDevise' of https://github.com/scottrhoyt/HY-Service-Directory into AddDevise

* 'AddDevise' of https://github.com/scottrhoyt/HY-Service-Directory:
  Generate Devise User Model.

Conflicts:
	app/models/user.rb
	db/schema.rb