Made seatwork.txt clearer
Resolved merged seatwork
test1 + JJ + master