last commit
Merge branch 'master' of https://github.com/Scorpioncik/demoshop.git
Final