Merge remote-tracking branch 'origin/master'

Conflicts:
	src/team4/retailsystem/model/LineItem.java
	src/team4/retailsystem/model/Product.java