Merge branch 'master' into CSSRedesign

requirements.txt

seed_database.py

store/forms.py

store/models.py

store/routes.py

store/static/_main.css

store/templates/basket.html

store/templates/checkout.html

store/templates/items.html

store/templates/order_summary.html

store/templates/userContent/ChangeEmail.html

store/templates/userContent/ChangePhNumber.html

store/templates/userContent/ChangeUsername.html

store/templates/userContent/login.html

store/utility.py