rqwer
reqew

rwe
Merge branch 'master' of https://github.com/themirt/cosmetic-shop

Conflicts:
	cosmeticshop/www/js/index.js