path changed
Merge branch 'master' of https://github.com/emilhein/02344

Conflicts:
	02334/.classpath
Merge branch 'master' of https://github.com/emilhein/02344