thinks
Merge branch 'markupfix' of github.com:davidnuon/metermaids into markupfix

Conflicts:
	templates/index.html