updated project
Merge branch 'master' of https://github.com/Howsterz/pandemic
removed strange artifacts in stup.cpp file which caused compiling errors -- Derrick

Found:

Lines: 216a240,241
> <<<<<<< HEAD
> =======
Lines: 217a243
> >>>>>>> 30115963e03dba3ddcfa6290ffd1a95598fd193d
396a360,464

...and at the end of the file:
> <<<<<<< HEAD
> =======
> >>>>>>> 30115963e03dba3ddcfa6290ffd1a95598fd193d