merging branches

This will hopefully update the CV page.