ignore
switched to mini
Merge branch 'master' into gh-pages