Merging, for some reason it thinks everything is a new file
Merge branch 'master' of https://github.com/JoshGangloff/Grid2Go.git

Conflicts:
	src/backend/Utils.java
	src/gui/MainMenuScreen.java