improvements
fixes conflicts
Merge branch 'master' of github.com:mrzool/cv

Conflicts:
	cv.tex