Changed Category
Commit
Merge branch 'master' of
https://github.com/milandashara/StoreApps-Assignment.git

Conflicts:
	StoreApplication/src/com/iss/storeApplication/view/CategoryView.java