minor changes
Merge branch 'master' of https://github.com/xmpir/dissys

Conflicts:
	dslab3/src/dslab/bidclient/Data.java