fixing merge issues
Merge branch 'master' of https://github.com/ZacMcClain/443
Merge branch 'master' of https://github.com/ZacMcClain/443
Merge branch 'master' of https://github.com/ZacMcClain/443
nothing new not working very well to at all