pulling phoebe's fix
adding gitignore
trying to pull
fixed merge conflicts
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project