Merge origin/master

Conflicts:
	FinalProject/images/Candle/candle1.png
	FinalProject/images/Candle/candle2.png
	FinalProject/images/Candle/candle3.png
	FinalProject/images/roomFiveFloor.png
	FinalProject/src/Final_Project_fixed/GamePanel.java
	FinalProject/src/Final_Project_fixed/Room.java
Merge origin/master

Conflicts:
	FinalProject/images/Candle/candle1.png
	FinalProject/images/Candle/candle2.png
	FinalProject/images/Candle/candle3.png
	FinalProject/images/roomFiveFloor.png
	FinalProject/src/Final_Project_fixed/GamePanel.java
	FinalProject/src/Final_Project_fixed/Room.java