edited folder paths
Merge branch 'master' of https://github.com/Kimber/Matadorpy