st1
Merge branch 'master' of https://github.com/lduenser/vSys2012

Conflicts:
	Lab3/DSLab3/src/client/InputThread.java
	Lab3/DSLab3/src/server/threads/AuctionServerThread.java