commands.py
Merge branch 'master' of github.com:HumblePaper/FileFormatConversion
html to xhtml+fixes
Merge branch 'master' of github.com:HumblePaper/FileFormatConversion

Conflicts:
	tornado/init_tornado.py