profile conflict resolve
gitignore update
Merge branch 'master' of https://github.com/cdaringe/cdaringe-home