changed ruby version to 2.1.2
added models for offices and devise users
working on registrations and routing for devise
added devise registrations controller and updated routes and schema
added devise up until mailer
got company and admin to work
working except for user signup params
Devise is working, but need to redirectt pages
Merge branch 'master' into origin/devise

Conflicts:
	db/schema.rb
Merge pull request #3 from kwoodard22/origin/devise

Origin/devise