fixed object.keys bug
Merge branch 'master' of github.com:jconnuck/tableslip

Conflicts:
	build/js/main.js
	public/js/main.js