Monday.
Merge branch 'master' of https://github.com/kardam/flatland

Conflicts:
	flatland/static/javascript/flatland.js
	flatland/templates/flatland.html