Update category functions
Update category.js
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palaba

Conflicts:
	js/script.js
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palaba