add window
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/swing/testing/mainFrame.java
fix conflicts
fix conflicts