This is just me learning to do soem git stuff, like merging 2 history trees into 1 linear series of commits.