Merge pull request #154 from power9/master

cleared out comments
Merge pull request #155 from COPPER-BOBCAT/staging

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

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

Staging
Added jsdocs folder
Merge pull request #158 from RTakes/conflictRes

Added jsdocs folder
Merge pull request #159 from RTakes/conflictRes

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

Submit and Skip Questions
Merge pull request #161 from COPPER-BOBCAT/staging

Staging
added comments in server code