Updated Javadoc
Merge branch 'master' of https://github.com/mbardoe/InfectionSimulation

Conflicts:
	README.md