static
Merge branch 'master' of github.com:owad/dziobak

Conflicts:
	templates/base/main.html