getting weird git error when pulling PLEASE WORKKK
Merge branch 'master' of github.com:katherineng/terrace