Oh dear
Merge branch 'master' of https://github.com/Uberi/qodex

Conflicts:
	static/index.html