gitignore
Merge branch 'master' of github.com:stephanfowler/troughs