a
Merge branch 'master' of https://github.com/nahatle/UserInterfaces_Projekt

Conflicts:
	src/application/LibraryApp.java
merge