Merge
Merge branch 'master' of https://github.com/westronham/Project.git
Final
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/src/DifficultySelectMenu.java
	Project/src/HighScoreMenu.java
	Project/src/MainMenu.java
Final
Merge branch 'master' of https://github.com/westronham/Project.git