merge
Merge branch 'master' of https://github.com/kloki/SaunaParadise

Conflicts:
	main.py
implemented questionaire