add logp alias
add bash-git-prompt
Merge branch 'master' of github.com:alinefr/dotfiles

Conflicts:
	.gitmodules