Test github diff
Merge branch 'master' of https://github.com/davekr/pyshuffle