flag test passing
building test 1 passing
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project into phoebeBranch
pulling from master before pushing
tried to make code less repetitive; will need some sort of hash to keep track of each marker and its respective information..slightly cleaner now, will make even cleaner later