committing before pull or else I have to hard reset
Merge branch 'master' of https://github.com/anmolg/cpsc410