sdffsdf
Merge branch 'master' of https://github.com/jamesyang9/LatexIt

Conflicts:
	db/site.db
Merge branch 'master' of https://github.com/jamesyang9/LatexIt