fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/healtycaresystem/DatabaseOperations.java
Merge remote-tracking branch 'origin/master'
fix
Merge remote-tracking branch 'origin/master'