last commit before upstream pull
tweak gitignore
Merge branch 'master' of https://github.com/coreyp/lobsters