Merge pull request #13 from cougarTech2228/master

rebaseing
Merge pull request #15 from cougarTech2228/working

pointless merge