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