sai natuke tubade käitumist parandatud
Merge branch 'master' of https://github.com/SteamRiC/Temere

Conflicts:
	frontend/index.html
Merge branch 'master' of https://github.com/SteamRiC/Temere