Merge pull request #157 from COPPER-BOBCAT/staging

Staging
Merge pull request #158 from RTakes/conflictRes

Added jsdocs folder
changes
finished submit
Merge pull request #160 from zindlerb/master

Submit and Skip Questions