products in menu made
about to make stuff for edit/delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
products in menu made
about to make stuff for edit/delete