- Some view edits, probably broke some stuff.
Merge branch 'master' of github.com:mdlayher/khan

Conflicts:
	views/main/index.php