stash
Merge branch 'master' of https://github.com/vladsaveliev/devdays

Conflicts:
	devdays/db.sqlite3