Bacon

Branching & merging is as it always is, but it looks like the displayed site is based on #master