Pipapo
Merge branch 'master' of https://github.com/sthuber90/Bibliothek.git

Conflicts:
	.project
Test