deleted:    src/main/java/cs/hm/edu/sam/mc/emergency/Emergency.java
	new file:   src/main/java/cs/hm/edu/sam/mc/emergent/Emergent.java
	modified:   src/main/java/cs/hm/edu/sam/mc/gpsTable/GPSViewer.java
	modified:   src/main/java/cs/hm/edu/sam/mc/ir/Ir.java
	new file:   src/main/java/cs/hm/edu/sam/mc/ir/enum_interfaces/ColorEnum.java
	modified:   src/main/java/cs/hm/edu/sam/mc/ir/enum_interfaces/GUIInterface.java
	modified:   src/main/java/cs/hm/edu/sam/mc/ir/enum_interfaces/TasksEnum.java
	modified:   src/main/java/cs/hm/edu/sam/mc/main/Main.java
Merge branch 'master' of https://github.com/eusi/MissionControlHM

Conflicts:
	src/main/java/cs/hm/edu/sam/mc/main/Main.java
Merge branch 'master' of https://github.com/eusi/MissionControlHM

Conflicts:
	src/main/java/cs/hm/edu/sam/mc/ir/Ir.java

	modified:   src/main/java/cs/hm/edu/sam/mc/emergent/Emergent.java
	modified:   src/main/java/cs/hm/edu/sam/mc/ir/Ir.java
	modified:   src/main/java/cs/hm/edu/sam/mc/ir/enum_interfaces/GUIInterface.java
Merge branch 'master' of https://github.com/eusi/MissionControlHM

Conflicts:
	src/main/java/cs/hm/edu/sam/mc/ir/Ir.java

	modified:   src/main/java/cs/hm/edu/sam/mc/ir/Ir.java
	modified:   src/main/java/cs/hm/edu/sam/mc/ir/main_ground/EmergentComponent.java
	modified:   src/main/java/cs/hm/edu/sam/mc/ir/Ir.java