Commit from Lippstadt, after merging
Merge branch 'master' of https://github.com/magnus-lutz/backup
ehhh
Conflicts:
	Documents/Proposal/makefile
makefile weiter verbessert und neues "export" target