commit by brianna
Merge branch 'master' of https://github.com/tyler-hoffman/cs-club