Added user model with devise
merged peters db with newest
Merge commit '82698fb779c9a8a9204a4e8ca01e81654a2ef2dc'

* commit '82698fb779c9a8a9204a4e8ca01e81654a2ef2dc':
  Added user model with devise

Conflicts:
	config/routes.rb
	db/schema.rb