changes
Merge pull request #27 from cougarTech2228/working

changes