finished reset
correcting merge conflicts from luke's pull
Merge pull request #10 from wweliz/finished-reset

finished reset