Merge pull request #22 from cougarTech2228/working

Working
edits
edits
Merge pull request #23 from cougarTech2228/(not)working

edits
Merge pull request #24 from cougarTech2228/master

merge
edits
edits
edits
changes
more edits