added github user to .gitconfig
added git cherry-pick alias
Merge branch 'master' into laptop