home html done
Merge branch 'master' of https://github.com/adambarghouthi/CatShop

Conflicts:
	public_html/index.html