commit to avoid problems with github
commit  to avoid problems with github
commit to avoid problems with github
Merge branch 'master' of https://github.com/KTHHVAC/OpenTestbed

Conflicts:
	Software/Matlab/ExampleOfControllerSchedule.txt