Just me messing around, also trying to see how git does branches and merges