df
Metrge branch 'master' of http://github.com/xonxt/htw-forschungsproject

Conflicts:
	Variable.h
Merge branch 'master' of http://github.com/xonxt/htw-forschungsproject

Conflicts:
	Variable.cpp
Msda
erge branch 'master' of http://github.com/xonxt/htw-forschungsproject

Conflicts:
	Variable.cpp