testcode
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
merge
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
kommentare aktualisiert
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
test befehl verandert
junction
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14

Conflicts:
	Makefile
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Testcode
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
#57 warning entfernt
test