Merge pull request #42 from cougarTech2228/working

Working
Merge pull request #43 from cougarTech2228/master

Merge pull request #42 from cougarTech2228/working