trade working, bu ya
Merge branch 'master' of https://github.com/cameronmccord2/cs340