Erster Commit
Erster Commit
Merge branch 'master' of https://github.com/holgergp/FPFTOOP

Conflicts:
	.gitignore