Merge pull request #155 from COPPER-BOBCAT/staging

Staging
add jsdocs
Merge pull request #156 from RTakes/conflictRes

Added jsdocs