Tidy up
Merge branch 'PawelNew'
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/controller/CategoriesController.java
dfdfdfd
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/controller/CategoriesController.java