VERSION2
Merge branch 'master' of https://github.com/dan93c/cemetery.git

Conflicts:
	src/main/java/ro/immortals/dao/impl/New Text Document.txt