Merge origin/master

Conflicts:
	src/Main/FileHandler.java