Added base User resource.
Merge branch 'Master' into rentals

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