Merge branch 'master' of https://github.com/iordan93/TheBandomeerGame

Conflicts:
	src/minesweeper/MinesweeperApplication.java
	src/minesweeper/controllers/WelcomeScreenController.java
	src/minesweeper/views/welcomeScreen.fxml
Merge branch 'master' of https://github.com/iordan93/TheBandomeerGame

Conflicts:
	src/minesweeper/controllers/WelcomeScreenController.java
	src/minesweeper/views/welcomeScreen.fxml