fixed destroy
Included erd file
Final fix
Fixed password field
Add or delete to profile
Merge branch 'medical' into employee

Conflicts:
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	app/views/users/edit.html.erb
	app/views/users/show.html.erb
	db/schema.rb
	public/erd.pdf
Finalized