Suvaline comit
Helmese harus olles lisan commiti
Olles Master harus lisan commiti
Olles Einari harus lisan commiti
Merge branch 'master' into Einar

Conflicts:
	startthedark/settings.py
Lahendasin merge konflikti