Merge branch 'master' of https://github.com/TGIF-Productions/GitMergeTesting
Added Testing
Merge branch 'stuBranch'
Merge branch 'garrettBranch'
Updated Testing for Classes