Merge origin/master

Conflicts:
	FinalProject/Options.xml
	FinalProject/src/Final_Project_fixed/GamePanel.java