v0.3 -> v0.31 (Some real progress!)
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/main.html
v0.3 -> v0.31 (Some real progress!)