Fixed changes
Merge pull request #12 from LaunchAcademy/index_test

RFR
Merged master with assocate_shop_with_user and resolved schema merge conflicts.