2
Merge branch 'master' of https://github.com/MANGOWIKI/digital-wardrobe

Conflicts:
	index.php