minors
merge
Merge branch 'master' of https://github.com/BenRab/petri

Conflicts:
	src/petrinet/fxml/FXMLDocument.fxml