quickfix
post converted xhtml to awesome
Merge branch 'master' of github.com:HumblePaper/FileFormatConversion

Conflicts:
	tornado/init_tornado.py