EV3 8

Conflicts:
	Project1/src/a/Class1.java