Funnel has become the de facto development branch; merge it back into main. #29

Closed novedevo closed 3 years ago