docu
Merge pull request #1 from stefawolf/master

docu
To-Do list edited
bla
Merge https://github.com/Freeflow20/ICALL

Conflicts:
	VocabularyExercise.odt
File modified
Delete VocabularyExercise_mod.odt
Stefie's maven stuff, 10.06
Merge https://github.com/Freeflow20/ICALL
Merge pull request #1 from Freeflow20/master

test_request