omg
Merge branch 'master' of https://github.com/Yanushik/simpleblog2

Conflicts:
	db/development.sqlite3