Added *.lock to .gitignore
Merge branch 'master' of https://github.com/JesseHill/eve-production
Shopping list, v2