Finally closure :D
edited text
Merge pull request #4 from JensMetzner/master

query part
Merge pull request #1 from enplotz/datamodel

Data model typo
Merge remote-tracking branch 'refs/remotes/Manu/master'
TX/CC slides
Update 09_applications.tex
Merge remote-tracking branch 'refs/remotes/Manu/master'
Some general stuff
Merge branch 'master' of github.com:enplotz/graph_zahl
Reinclude CIA
fine tuning
Storage finished.
Merge branch 'master' of github.com:enplotz/graph_zahl
Merge remote-tracking branch 'refs/remotes/Manu/master'

Conflicts:
	presentation/include/01_general.tex
Merge pull request #5 from MarcSpicker/master

Fine tuning..
Update 07_scal_avail_fault_tol.tex
finished?
Merge remote-tracking branch 'refs/remotes/Manu/master'

Conflicts:
	presentation/include/07_scal_avail_fault_tol.tex
Merge pull request #6 from MarcSpicker/master

Close call