testing out this new branch
Merge branch 'branch2' of github.com:jormak27/Collaborate_with_Candic3 into testing
committing and adding everything having to do with testing