working exercises preview and "Add Exercise" 1
Merge remote-tracking branch 'origin/master'