ignoreerides praksi soovitusi, siin on mitte midagi ütlev commit
Merge branch 'master' of https://github.com/SteamRiC/Temere

Conflicts:
	backend/temere.py
no message