merge
Merge remote-tracking branch 'origin/master'
Merged Felix's and my stuff
Merged Felix's and my stuff
Merge branch 'master' of https://github.com/westronham/Project.git

Conflicts:
	Project/MyGame.ser
	Project/src/HighScoreMenu.java
	Project/src/MainMenu.java
	Project/src/PlayMenu.java