Added setup function/started work on it
Merge branch 'feature-shopPage' for testing
Added some things to setup
Created options container on shop page
Created shop index table
Merging feature-shopPage to keep develop up-to-date
Merge branch 'develop' to stay up to date