mysqldb com
Merge remote-tracking branch 'origin/grafon' into grafon

Conflicts:
	db.sqlite3
Merge branch 'grafon' of D:\pyprog\coursedb with conflicts.
mysqldb com