cv
hny
Revert "hny"

This reverts commit 185cb48e01a014ed0c7163ce974bff59711bb2da.
More Commenting and Arrangement
fixed query subcat
sorted alphabetically lists in query
updated to master
45r4r4
Merge branch 'PawelMerge'

Conflicts:
	src/com/group8/model/DataQueries.java
conflict fixed
Merge branch 'PawelMerge'
Merge branch 'PawelNewMerge'
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/view/MaintainPanel.java
merge1
Merge branch 'PawelNewMerge'
fixed conflicts
conflicts fixed
Moved Jtable to view
fixed conflicts to master
fixed port number