Beginning app
Merge branch 'master' of github.com:cherimarie/searchable_catalog