Merge branch 'Alex's-Branch'
Merge branch 'Alex's-Branch'
Merge branch 'Alex's-Branch'
Fixed virus strength calibration
Merge branch 'master' into Alex's-Branch