view-functions & comments
Merge branch 'master' of https://github.com/hydrognomik/myblog

Conflicts:
	db.sqlite3