horribly messy em
Merge branch 'master' of https://github.com/clarkkev/big-data
some editing