Merge branch 'master' of https://github.com/dteske25/DiagKnows

Conflicts:
	bin/Doctor.class