Initial add-category branch commit
Inital add product branch commit
Add category basic complete
Merge branches 'add-product' and 'master'
Add catagory complete basic
Resolve merge conflics
resolveConlf
Merge branches 'Add-Category' and 'master'