commit
Merge branch 'master' of https://github.com/jrosco85/AuctionSniper.git

Conflicts:
	src/es/auction/sniper/Main.java