debugged scanner
fixed merge conflict
Merge branch 'master' of https://github.com/srwareham/SLogo
added javadocs