Merge Conflict
Merge branch 'master' of https://github.com/sushmithas/headstart_project2
c43679e9fe724369bed5b88.

Conflicts:
	server/test.py
Revert "JSON fix for Category List"

This reverts commit c16430dfa73194811c43679e9fe724369bed5b88.