Conflicts pushed

It looks like [this commit](https://github.com/GeoJSONWG/draft-geojson/commit/61b837402eb0b5ec19f7c19e7710fdfbdbf47d71#L0R225) was committed/pushed without resolving merge conflicts.  While I think forced pushes are Very Bad Practice on shared repositories, at this point, I'd be in favor of doing a hard reset to be82b4664c3496c728a11d646c47798986c5ba1f and starting over with discussion on the recently closed pull requests (#1, #2, #3).

Alternatively, those commits could be reverted with another commit.

I'd also like to establish what gets edited and what gets generated.  I'd be in favor of having only a single set of sources in the master branch.  We could use a gh-pages branch for built artifacts (see #5).

If people are in favor, I'll do a hard reset to be82b4664c3496c728a11d646c47798986c5ba1f, and we can start over with #1, #2, and #3.