Added Susanne to Main
Merge
Merge origin/master

Conflicts:
	src/git1/Git1.java
Merge origin/master

Conflicts:
	src/git1/Git1.java