Merge branch 'master' of https://github.com/edenzik/BioLab18HuntingtonAggSimulation

Conflicts:
pa01/Vortex/Counter.class
pa01/Vortex/Inhibitor.class
pa01/Vortex/Space.class
pa01/Vortex/StartScreen.class
pa01/Vortex/project.greenfoot