Starting bidding?
Merge branch 'master' of https://github.com/ajkolenc/PencilPusherPrototype

Conflicts:
	player.js