add some
Merge branch 'master' of https://github.com/DeantoPrivate/myPetri

Conflicts:
	.idea/workspace.xml
	out/production/myPetri/components/Constructor/StateStatusPanel.class
	src/components/Constructor/StateStatusPanel.java