komentare
Merge branch 'master' of github.com:kolovsky/PT_SP

Conflicts:
	Graph.java
	Process.java
	Settle.java
	SettleNode.java
	Statistic.java
	Supply.java