elias changes
Merge branch 'master' of ssh://git@github.com/than-tryf/Test2.git

Conflicts:
	EPL231Team/src/teamhw/MainProg.java
	EPL231Team/src/teamhw/MyGraph.java