Merge pull request #9 from jeffChavez/parker

Parker
trying to make contact
Merge pull request #10 from jeffChavez/jeff

trying to make contact
fixed conflicts