Extra credit of subversion assignment, merging with git.