EV2 1 a 6

Conflicts:
	Project1/src/a/Class1.java