fixed temp calc
update systemc merging
Merge branch 'master' of github.com:SamuelSorge/RequirementsEngineeringUebungen