Version 2.0

With this commit, we can now close issue #4 and launch version 2.0 of
the triangle’s website.

Welcome back to Build 1.
Resolving conflicts