commiting to be able to push
commiting to be able to pull
category show now displays products
database merge conflict fixed
added edit page to categories