Merge origin/master
Changed encounter create event to allow me to pass in my desired cases. Having issues instantiating the encounter factory in the JUnit, but the JUnits are formatted correctly
Merging
Merge origin/master

Conflicts:
	src/controllers/EncounterFactory.java
Merge origin/master