Merge pull request #32 from cougarTech2228/master

hi
Merge pull request #33 from cougarTech2228/working

Merge pull request #32 from cougarTech2228/master