finally I have remembered to commit
Merge branch 'master' of https://github.com/serye/cv

Conflicts:
	.gitignore