Sample
Merge branch 'master' of https://github.com/nickyudha/ayujewellery

Conflicts:
	static/nav.php