first pass merged document
Merge pull request #4 from britram/master

first pass merged document