git extensions edit
Merge branch 'json_table' of https://github.com/guanzo/CHCYF

Conflicts:
	index.html
fixed filter
fixed filters