Merge branch 'master' of https://github.com/etporter/Data-Structures-Learning-Tool

Conflicts:
	src/DSLTcanvas.java
update window