fixed location errors and added siphon script
Merge branch 'master' of https://github.com/abadrenkov/data-analysis-template