Resolving MATsim version issues#320

Open

CorinStaves wants to merge 2 commits intomsmobility:masterfrom

CorinStaves:master

Commits on Jan 7, 2021

Merge pull request #1 from msmobility/master
CorinStaves
authored

Commits on Jan 13, 2021

Resolving some MATSim version conflict issues (now using 12 instead of 11)
CorinStaves
committed