Added Slides/CrashCourse_2014.ppt to repo.
Minor changes compared to 2013
Merge branch 'master' of https://github.com/open-ideas/Initiatory

Conflicts:
	Slides/CrashCourse_2014.ppt
Removed old powerpoints
Changed naming of the Coonector package to thermalMasses.
Minor changes to LIB/Classes renamed some examples
New slides updated from _MVC_DP_CP version
Merge pull request #5 from cprotopa/master

Updated code for IDEAS exercise
slides update + ListOfAttendance.txt
Merge branch 'master' of https://github.com/open-ideas/crashcourse

Conflicts:
	Slides/CrashCourse_2014.ppt
Merge branch 'master' of https://github.com/matsvandecavey/crashcourse

Conflicts:
	Slides/CrashCourse_2014.ppt
Deleted parts to be modeled by students. Changed W/m2 in Occupant_ISO13790.mo
remove factor 0.1 in occupants gain.
Merge pull request #7 from cprotopa/NoSolutions

Deleted parts to be modeled by students. Changed W/m2 in Occupant_ISO137...
add final Slides/CrashCourse_2014MVC_DP_CP.ppt
Merge branch 'NoSolutions' of https://github.com/open-ideas/Initiatory into NoSolutions
merge changes mats
Merge branch 'master' of https://github.com/matsvandecavey/crashcourse

Conflicts:
	Lib/Classes/FixedMass.mo
	Lib/Classes/Layer.mo
	Lib/Classes/LayerFiniteElement.mo
	Lib/Classes/PCMMass.mo
	Lib/Classes/PartialCap.mo
	Lib/Classes/TwoLayers.mo
	Lib/Classes/package.order
	Lib/Connectors/package.mo
	Lib/Example/FixedHeatFlow.mo
	Lib/Example/FixedTemperature.mo
	Lib/Example/OnOffHeatFlow.mo
	Lib/Example/PipeTester.mo
	Lib/Example/PipeWithHeatPort.mo
	Lib/package.order
	Slides/CrashCourse_2014.ppt
delete old models
Small changes
Merge branch 'master' of https://github.com/open-ideas/Initiatory

Conflicts:
	Slides/CrashCourse_2014.ppt