Hw 2 submission
Merge pull request #47 from kayarre/master

Hw 2 submission - Kurt Sansom