t
Merge branch 'master' of github.com:hugohu/sally

Conflicts:
	sally2.0/html/file.html