Add nvim alias
Fix touch bug
Modify ps1 if git ps1 exist
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bash.d/prompt.sh