hoho
Merge branch 'master' of https://github.com/hannymahfuz/shop

Conflicts:
	index.php