autosaving
Merge branch 'master' of https://github.com/srwareham/SLogo

Conflicts:
	src/control/Controller.java
autosave