and
Merge branch 'master' of github.com:Michaluch/bottle_blog

Conflicts:
	controlers.py