Adding to hw3git
Merge https://github.com/devannotate/hw3git