modifed temp.m
Merge branch 'master' of https://github.com/KTHHVAC/OpenTestbed

Conflicts:
	Software/Matlab/+OccupancyEstimators/temp.m

train the occupancy estimator again
Merge branch 'master' of https://github.com/KTHHVAC/OpenTestbed
trainn the occupancy estimator