add jsdocs
Merge pull request #156 from RTakes/conflictRes

Added jsdocs
Merge pull request #157 from COPPER-BOBCAT/staging

Staging