1. list.html modify
Merge branch 'master' of github.com:cristov/tatsuta

Conflicts:
	_list.html