base
Merge branch 'master' of https://github.com/Ivan0x32/musicstore

Conflicts:
	.gitignore
	action/IAction.php
	model/ProductModel.php