added kmartine
Merge branch 'master' of http://github.com/Git-Stuco/HW2