db
Merge branch 'master' of https://github.com/totemteleko/blog_2012

Conflicts:
	blog.sqlite