small
finished adding example timeline for the Easy difficulty
prepare for merge
Merge branch 'master' into gh-pages

Conflict between gh-pages keeping dragdrop.html as the old game and master branch keeping the modified game.