Testing branching and merging.
Merge branch 'master' of github.com:arcra/PNPlanDesignTool

Conflicts:
	petrinets.py