to avoid merge conflicts, adding this
updating local directory
Merge branch 'master' of https://github.com/starbuck93/14F_CS374_Team2