resources.jar nervtresources.jar nervt
Merge branch 'master' of https://github.com/simso/Friedhofsmanager

Conflicts:
	libs/resources.jar
gameOver wechsel ins main menue
Merge branch 'master' of https://github.com/simso/Friedhofsmanager

Conflicts:
	.idea/workspace.xml