nother test
Merge origin/master

Conflicts:
	src/BasicPanel.java
fixed kevins deal