didn't change much
Merge branch 'master' of https://github.com/RobertCorey/shift-bid

Conflicts:
	php/drawTable.php