init from ftp://ftp.cs.wisc.edu/markhill/
Merge remote-tracking branch 'origin/master'