mal sehen, ob das mergen klappt
Merge branch 'master' of https://github.com/numsim1415/num

Conflicts:
	README
Merge branch 'master' of https://github.com/numsim1415/num