I am bad at git

Instead of making a separate branch and then trying to merge my
changes, I figured it would be easier to just try to make a folder and
then try to merge things manually...