documentation
Merge pull request #1 from cooperhewitt/master

documentation