Update Exercise1.java
Merge branch 'work'

Conflicts:
	git-exercise/src/exercise/Exercise1.java