Add new class Window
Merge branch 'b2'

Conflicts:
	TestApp/src/Door.java