Commit RaftControl
Merge origin/master

Conflicts:
	chooseYourOwnAdventure/src/chooseyourownadventure/ChooseYourOwnAdventure.java
Commit GUI 2