Added Devise, CanCan and generated user model
Merge branch 'master' of https://github.com/alindeman/pathway-homes

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/mepps/pathway-homes