SOme code rewritten for better readability
Merge origin/master

Conflicts:
	src/main/java/eu/digitisation/Main.java