working on videos
fixed merge in lesson.rb
working with chess board
fixed schema conflicts
trying to figure out jchess
fixed merge
the answer to all our problems
nothing
fixed merge conflict