Merge pull request #24 from cougarTech2228/master

merge
edits
edits
edits
changes
more edits
merged fix from master down to working
some changes, forget what exactly
Merge pull request #25 from cougarTech2228/working

Working