sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/cse470/osia/ViewInventory$2.class