commit before pull
Merge branch 'master' of github.com:joubin/CSC191

merge things yay
i dont even know at this point
Merge branch 'master' of github.com:joubin/CSC191

MERGEEDASFKLJSDFDSF