Finished index testing
Added test to add shop
Established user creating new shop
Resolved merge conflicts
Fixed changes
Merge pull request #12 from LaunchAcademy/index_test

RFR