second todo done
second todo done
Merge origin/master

Conflicts:
	src/Entities/FileHandler.java
Merge origin/master

Conflicts:
	src/Entities/FileHandler.java