modified:   ../app/controllers/application_controller.rb
	renamed:    ../app/views/Tenant/confirmations/new.html.erb -> ../app/views/admins/confirmations/new.html.erb
	renamed:    ../app/views/Admin/mailer/confirmation_instructions.html.erb -> ../app/views/admins/mailer/confirmation_instructions.html.erb
	renamed:    ../app/views/Admin/mailer/reset_password_instructions.html.erb -> ../app/views/admins/mailer/reset_password_instructions.html.erb
	renamed:    ../app/views/Admin/mailer/unlock_instructions.html.erb -> ../app/views/admins/mailer/unlock_instructions.html.erb
	renamed:    ../app/views/Admin/passwords/edit.html.erb -> ../app/views/admins/passwords/edit.html.erb
	renamed:    ../app/views/Tenant/passwords/new.html.erb -> ../app/views/admins/passwords/new.html.erb
	renamed:    ../app/views/Admin/registrations/edit.html.erb -> ../app/views/admins/registrations/edit.html.erb
	renamed:    ../app/views/Tenant/registrations/new.html.erb -> ../app/views/admins/registrations/new.html.erb
	renamed:    ../app/views/Tenant/sessions/new.html.erb -> ../app/views/admins/sessions/new.html.erb
	renamed:    ../app/views/Admin/shared/_links.erb -> ../app/views/admins/shared/_links.erb
	renamed:    ../app/views/Tenant/unlocks/new.html.erb -> ../app/views/admins/unlocks/new.html.erb
	renamed:    ../app/views/landlord/confirmations/new.html.erb -> ../app/views/landlords/confirmations/new.html.erb
	renamed:    ../app/views/Tenant/mailer/confirmation_instructions.html.erb -> ../app/views/landlords/mailer/confirmation_instructions.html.erb
	renamed:    ../app/views/Tenant/mailer/reset_password_instructions.html.erb -> ../app/views/landlords/mailer/reset_password_instructions.html.erb
	renamed:    ../app/views/Tenant/mailer/unlock_instructions.html.erb -> ../app/views/landlords/mailer/unlock_instructions.html.erb
	renamed:    ../app/views/landlord/passwords/edit.html.erb -> ../app/views/landlords/passwords/edit.html.erb
	renamed:    ../app/views/landlord/passwords/new.html.erb -> ../app/views/landlords/passwords/new.html.erb
	renamed:    ../app/views/landlord/registrations/edit.html.erb -> ../app/views/landlords/registrations/edit.html.erb
	renamed:    ../app/views/landlord/registrations/new.html.erb -> ../app/views/landlords/registrations/new.html.erb
	renamed:    ../app/views/landlord/sessions/new.html.erb -> ../app/views/landlords/sessions/new.html.erb
	renamed:    ../app/views/Tenant/shared/_links.erb -> ../app/views/landlords/shared/_links.erb
	renamed:    ../app/views/landlord/unlocks/new.html.erb -> ../app/views/landlords/unlocks/new.html.erb
	modified:   ../app/views/layouts/application.html.erb
	renamed:    ../app/views/Admin/confirmations/new.html.erb -> ../app/views/tenants/confirmations/new.html.erb
	renamed:    ../app/views/landlord/mailer/confirmation_instructions.html.erb -> ../app/views/tenants/mailer/confirmation_instructions.html.erb
	renamed:    ../app/views/landlord/mailer/reset_password_instructions.html.erb -> ../app/views/tenants/mailer/reset_password_instructions.html.erb
	renamed:    ../app/views/landlord/mailer/unlock_instructions.html.erb -> ../app/views/tenants/mailer/unlock_instructions.html.erb
	renamed:    ../app/views/Tenant/passwords/edit.html.erb -> ../app/views/tenants/passwords/edit.html.erb
	renamed:    ../app/views/Admin/passwords/new.html.erb -> ../app/views/tenants/passwords/new.html.erb
	renamed:    ../app/views/Tenant/registrations/edit.html.erb -> ../app/views/tenants/registrations/edit.html.erb
	renamed:    ../app/views/Admin/registrations/new.html.erb -> ../app/views/tenants/registrations/new.html.erb
	renamed:    ../app/views/Admin/sessions/new.html.erb -> ../app/views/tenants/sessions/new.html.erb
	renamed:    ../app/views/landlord/shared/_links.erb -> ../app/views/tenants/shared/_links.erb
	renamed:    ../app/views/Admin/unlocks/new.html.erb -> ../app/views/tenants/unlocks/new.html.erb
	modified:   ../config/routes.rb
Merge branch 'master' of https://github.com/jonwrandall/rentr4

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb