works better
Merge remote-tracking branch 'origin/master'

Conflicts:
	pychan/.idea/workspace.xml
	pychan/db/database.sqlite3
	pychan/templates/b.html
	pychan/templates/reply.html
better