doc-merge branch merged to master

I did a cursory check of https://github.com/w3c/webauthn/pull/44 and merged it.

The doc-merge branch remains and can be deleted (upon someone double 
checking merge results?)

=JeffH

Received on Thursday, 17 March 2016 18:39:25 UTC