almost done
Merge branch 'master' of https://github.com/jgrossmann/BigDataProject