- More layout changes
Merge branch 'master' of github.com:mdlayher/khan

Conflicts:
	webroot/edit.html