Fixing Firing
Merge origin/master

Conflicts:
	src/PetriNetworks.java