Merge origin/master

Conflicts:
	princessBride/src/byui/cit260/princessBride/control/SceneControl.java