I figured out the text joining thingy!
wat
Merge branch 'master' of github.com:CaptainShanks/CS-260