my changes
Merge branch 'master' of github.com:zpollock/bigdata