changes
resolving conflicts
Merge branch 'master' of github.com:shahabhameed/Clonify

Conflicts:
	WebSite/assets/js/main.js