panel added
panel added (2)
Merge branch 'panel'

Conflicts:
	src/base/Panel.java