added new files
added new files
changes
Merge branch 'master' into ShoppingCart

Conflicts:
	assets/stylesheets/main.scss
	scripts/mappings.ts
no message
changes
ShoppingCart
changes
changes
Merge branch 'master' into ShoppingCart

Conflicts:
	assets/stylesheets/main.scss
	assets/stylesheets/pages/_ShoppingCart.scss
	scripts/pages/ShoppingCart.ts
	scripts/pages/review.ts
Merge branch 'master' into Header