Not quite sure, must commit before merge on school PC
Merge remote-tracking branch 'origin/master'

Conflicts:
	RetailSystem/src/gui/CustomerOrderPanel.java
Merge remote-tracking branch 'origin/master'
Finished Finance Panel