docs
Merge pull request #1 from ryan-roemer/master

docs