Hw1 branch

Hw 1 pull request, for sansom