Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/model/Patient.java