tarik lagi
pull 13 may
Merge branch 'master' of https://github.com/awidarto/shoplite

Conflicts:
	.DS_Store
	public/.DS_Store
pull data 13 MAy2