tih
Merge branch 'master' of https://github.com/glajsnake/Reglerprojekt

Conflicts:
	main.m