Merge branch 'master' of https://github.com/nachume/tablemaker.js

Conflicts:
	tablemaker.js
Merge branch 'master' of https://github.com/nachume/tablemaker.js