doing to pull from masta fresh
most recent verzion
Fixed hickups in assignment.js