clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Screen.java
clean up after failed sync