nora
Merge branch 'master' of https://github.com/poklag/table

Conflicts:
	train1.html
Merge branch 'master' of https://github.com/poklag/table

Conflicts:
	train1.html