Syncing up
I still don't know what the fuck this "why this merge is necessary" shit is about. It's because I'm making sure I am up to date.  Anybody that wants to explain this to me... please do.  It seems random, but since Linus Torvolds made up Git, I assume it's a well thought out thing, but it seems completely random.  Like when you randomly have to fsck on boot of a Linux system, you dig?