auto dev server commit
Merge remote branch 'origin/master'
curriculum vitae/Teaching