Saddle work
Merge branch 'master' of https://github.com/arthurmensch/INF555

Conflicts:
	src/Window.java
	src/WindowList.java