Added more functions and hardcoded statements into the functions for the stub since they were just blank
Added more functions and hardcoded statements into the functions for the stub since they were just blank
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
Updated Cities.txt

Atlanta starts with Research Station by default
added getter to Map.h:
    vector<City*> getWorldMap()

...and made worldMap property private:
  private:
    vector<City*> worldMap;
added getter to Map.h:
    vector<City*> getWorldMap()

...and made worldMap property private:
  private:
    vector<City*> worldMap;

re-upped after removing "#include "Map.cpp" from .h file
Adding rules to docs folder
updating movetest.cpp and archiving old files
removed testCode.cpp since it's not needed anymore
Fixed misspelled cities
Updated MVC, added main loop and infection. Added string getter to player
Updated controller
Updated the updates. MVC in place, just needs movement code
made some changes but keeping seperate until MVC is straigtened out
Added missing comma after Atlanta - was causing error.
Changing Toronto to Montreal - didn't realize there were slight differences between maps.
Added the player movement to adjacent cities. Everything looks good on my end.

Added cin.ignores after cin>> inputs
Submission 2. Main is in controller.cpp
Submission 2. Main is on controller.cpp

Removed an unneeded file