update my cv
add a gitignore in hireme
Solve conflict
Merge branch 'develop'