Please work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/Panel.java