did stuff and cannot figure out git
Merge https://github.com/Croberson12/Crobertech