some fixes added
Merge branch 'master' of github.com:chhavi-khandelwal/Shopaholic_json_app
Merge branch 'master' of github.com:chhavi-khandelwal/Shopaholic_json_app
Merge branch 'master' of github.com:chhavi-khandelwal/Shopaholic_json_app

Conflicts:
	app/controllers/categories_controller.rb
Added more todos