A LOT OF STUFF CHANGING ON MASTER AND WHAT NOT
Merge branch 'master' of https://github.com/Corey255A1/Senior-Design