Merge branch 'Wayne' of https://github.com/Taffatech/HealthManagement

Conflicts:
	nbproject/project.properties
	src/Forms/InstructorForm.form
	src/Forms/InstructorForm.java
	src/Forms/LoginForm.form
	src/Forms/LoginForm.java
	src/Forms/Main.java
	src/Forms/MemberForm.form
	src/Forms/MemberForm.java
	src/Users/Instructor.java
	src/Users/Member.java
	src/images/left.png
	src/images/right.png
Still trying to Merger all day
Merge branch 'master' of https://github.com/Taffatech/HealthManagement

Conflicts:
	.gitignore
	build/classes/EmailClasses/EmailMethods.class
	build/classes/Forms/DutyManagerForm$1.class
	build/classes/Forms/DutyManagerForm$10.class
	build/classes/Forms/DutyManagerForm$11.class
	build/classes/Forms/DutyManagerForm$12.class
	build/classes/Forms/DutyManagerForm$13.class
	build/classes/Forms/DutyManagerForm$14.class
	build/classes/Forms/DutyManagerForm$15.class
	build/classes/Forms/DutyManagerForm$16.class
	build/classes/Forms/DutyManagerForm$17.class
	build/classes/Forms/DutyManagerForm$18.class
	build/classes/Forms/DutyManagerForm$19.class
	build/classes/Forms/DutyManagerForm$2.class
	build/classes/Forms/DutyManagerForm$20.class
	build/classes/Forms/DutyManagerForm$21.class
	build/classes/Forms/DutyManagerForm$22.class
	build/classes/Forms/DutyManagerForm$23.class
	build/classes/Forms/DutyManagerForm$24.class
	build/classes/Forms/DutyManagerForm$25.class
	build/classes/Forms/DutyManagerForm$26.class
	build/classes/Forms/DutyManagerForm$27.class
	build/classes/Forms/DutyManagerForm$28.class
	build/classes/Forms/DutyManagerForm$29.class
	build/classes/Forms/DutyManagerForm$3.class
	build/classes/Forms/DutyManagerForm$30.class
	build/classes/Forms/DutyManagerForm$31.class
	build/classes/Forms/DutyManagerForm$32.class
	build/classes/Forms/DutyManagerForm$33.class
	build/classes/Forms/DutyManagerForm$34.class
	build/classes/Forms/DutyManagerForm$35.class
	build/classes/Forms/DutyManagerForm$36.class
	build/classes/Forms/DutyManagerForm$37.class
	build/classes/Forms/DutyManagerForm$38.class
	build/classes/Forms/DutyManagerForm$39.class
	build/classes/Forms/DutyManagerForm$4.class
	build/classes/Forms/DutyManagerForm$40.class
	build/classes/Forms/DutyManagerForm$41.class
	build/classes/Forms/DutyManagerForm$42.class
	build/classes/Forms/DutyManagerForm$43.class
	build/classes/Forms/DutyManagerForm$44.class
	build/classes/Forms/DutyManagerForm$45.class
	build/classes/Forms/DutyManagerForm$46.class
	build/classes/Forms/DutyManagerForm$47.class
	build/classes/Forms/DutyManagerForm$48.class
	build/classes/Forms/DutyManagerForm$49.class
	build/classes/Forms/DutyManagerForm$5.class
	build/classes/Forms/DutyManagerForm$50.class
	build/classes/Forms/DutyManagerForm$51.class
	build/classes/Forms/DutyManagerForm$52.class
	build/classes/Forms/DutyManagerForm$53.class
	build/classes/Forms/DutyManagerForm$6.class
	build/classes/Forms/DutyManagerForm$7.class
	build/classes/Forms/DutyManagerForm$8.class
	build/classes/Forms/DutyManagerForm$9.class
	build/classes/Forms/DutyManagerForm.class
	build/classes/Forms/DutyManagerForm.form
	build/classes/WorkerClasses/LoadingMethods.class
	nbproject/private/private.properties
	nbproject/project.properties
	src/EmailClasses/EmailMethods.java
	src/Forms/DutyManagerForm.form
	src/Forms/DutyManagerForm.java
	src/Forms/InstructorForm.form
	src/Forms/InstructorForm.java
	src/Forms/LoginForm.form
	src/Forms/LoginForm.java
	src/Forms/Main.java
	src/Forms/MemberForm.form
	src/Forms/MemberForm.java
	src/Users/Instructor.java
	src/Users/Member.java
	src/WorkerClasses/LoadingMethods.java
	src/images/left.png
	src/images/right.png