Reverted HelloWorld.java and added HelloWorldDe.java
Jane and Joe to Master branch
Jane and Joe to master, 2nd try
blue hat purple hat to branch2
Merged branch2 to Master
Start Git lab

Conflicts:
	lab/lab2/lab1_git/MergeConflict.txt