nothing
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/model/MainModel.java
MainModel update
nothing
Revert "nothing"

This reverts commit b4cc73108eae76ccd2a8c7614a6734894c5d1c18.
Updated Chris controller