gitignore
Merge branch 'v1.0' of github.com:cronycles/crosetti into v1.0