trying to write html
Merge branch 'master' of https://github.com/sdford/LockTex

Conflicts:
	js/static/desktop/index.html