minor changes
Merge branch 'master' of https://github.com/open-ideas/crashcourse

Conflicts:
	Lib/Classes/Capacity_extended.mo
	Slides/CrashCourse_2012.ppt
minor changes
Merge branch 'master' of https://github.com/open-ideas/crashcourse
edit comments and and Exercise1