Multiple diseases cubes in cities

Changed the City class to be able to have multiple diseases at once.
Changed my code in the .cpp to reflect this.