Fixes merge conflict
Merge branch 'master' of https://github.com/alindeman/pathway-homes

Conflicts:
	db/schema.rb
Added role to users
Merge pull request #27 from mepps/master

Added role to user model