Merge origin/master

Conflicts:
	chooseYourOwnAdventure/src/byui/cit260/chooseYourOwnAdventure/control/RaftControl.java