sam's bids - WRONG
Merge branch 'master' of https://github.com/murtadha/megastore.git

Conflicts:
	src/com/ubc417/project/megastore/data/Bids.java