Bla
Merge branch 'master' of https://github.com/orenmm/epicon

Conflicts:
	EpidemicControl.xcodeproj/project.xcworkspace/xcshareddata/EpidemicControl.xccheckout