right side window
Merge branch 'master' of https://github.com/ekoulour/eTable.git

Conflicts:
	src/controller/MyController.java