Device part 1
Devise Part 2
Devise New Files
Merge branch 'master' of https://github.com/shbodya/rpit_desk

Conflicts:
	db/schema.rb

Merge