Merge remote-tracking branch 'origin/master'

Conflicts:
	Squelette-lab1/.classpath
	Squelette-lab1/IDLogger