marge
marge
Merge branch 'master' of https://github.com/Adam140/DynamicComplexNetwork.git

Conflicts:
	src/baseElement/Graph.java
	src/manager/main.java