WORKINGgit status
Merge branch 'master' of github.com:sethrosetter/CSCI4211