Changes over break
Merge branch 'master' of https://github.com/kitkage/virus

Conflicts:
	src/viriussimulator/Control.java
Regular city testing
Javadoc added