+ minor Controller changes
+ thumbs out of sync
Merge branch 'gui2' of
https://github.com/Tokanagrammar/tokanagrammar-dev into gui2

Conflicts:
	src/main/java/edu/umb/cs/gui/Controller.java
	src/main/resources/fxml/Categories.fxml
Merge branch 'gui2' of
https://github.com/Tokanagrammar/tokanagrammar-dev.git into gui2

Conflicts:
	src/main/java/edu/umb/cs/Tokanagrammar.java