Create test for User, Alert and Bid
Merge branch 'master' of https://github.com/darzul/bid

Conflicts:
	src/bid/Bid.java
	src/bid/User.java