Updating with EmergeAdapt work
Merge branch 'master' of github.com:joejag/cv