git wants me to
work git
Merge branch 'master' of https://github.com/Torwegia/cs660