Merge branch 'master' of https://github.com/reguy3/Gynokaleidoscope
Merge branch 'master' of https://github.com/reguy3/Gynokaleidoscope