redundant files deleted
conflict fixes

Conflicts:
	js/Auction.js
	js/globals.js
	js/program.js