fixes
Merge branch 'vtanders_jsstrat1' of https://github.com/vanceanderson41/cst316labcr into vtanders_jsstrat1