modified:   SourceCode/.project
	new file:   SourceCode/.pydevproject
	modified:   SourceCode/META-INF/MANIFEST.MF
	modified:   SourceCode/bin/ecs240/Activator.class
	new file:   SourceCode/bin/ecs240/datas/Controller.class
	new file:   SourceCode/bin/ecs240/datas/Host.class
	modified:   SourceCode/bin/ecs240/datas/Model$ModelChangeEvent.class
	modified:   SourceCode/bin/ecs240/datas/Model.class
	new file:   SourceCode/bin/ecs240/datas/Switch.class
	modified:   SourceCode/bin/ecs240/datas/Utility.class
	new file:   SourceCode/bin/ecs240/python/LogStreamReader.class
	new file:   SourceCode/bin/ecs240/views/LogStreamReader.class
	new file:   SourceCode/bin/ecs240/views/MininetRunner.py
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView$1.class
	renamed:    SourceCode/bin/ecs240/views/TopologyEditorView$1.class -> SourceCode/bin/ecs240/views/TopologyEditorView$2.class
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView$ModelChangeEventListener.class
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView$NetworkNodeDragListener.class
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView$NetworkNodeMouseListener.class
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView$SourceListDragListener.class
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView$SourceListMouseListener.class
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView$TargetAreaDropListener.class
	modified:   SourceCode/bin/ecs240/views/TopologyEditorView.class
	new file:   SourceCode/icons/controller.jpg
	new file:   SourceCode/icons/host.jpg
	modified:   SourceCode/src/ecs240/Activator.java
	new file:   SourceCode/src/ecs240/datas/Controller.java
	new file:   SourceCode/src/ecs240/datas/Host.java
	modified:   SourceCode/src/ecs240/datas/Model.java
	new file:   SourceCode/src/ecs240/datas/Switch.java
	modified:   SourceCode/src/ecs240/datas/Utility.java
	new file:   SourceCode/src/ecs240/views/LogStreamReader.java
	new file:   SourceCode/src/ecs240/views/MininetRunner.py
	modified:   SourceCode/src/ecs240/views/TopologyEditorView.java
Merge branch 'master' of https://github.com/YixinZhao/ECS240-Project

Conflicts:
	SourceCode/META-INF/MANIFEST.MF
	SourceCode/src/ecs240/datas/Utility.java
	modified:   SourceCode/META-INF/MANIFEST.MF
	modified:   SourceCode/src/ecs240/datas/Utility.java