Including 'gaa' alias (git add --all)
Alias 'cap'
Cleaning bash_profile
Including aftermerge funcion to bash_profile