second commit
Merge https://github.com/tlcuzick/shopping-list-app