update todo
settings.py: add code highlight extension
Merge remote-tracking branch 'upstream/master'