Added git editor
Merge branch 'master' of github.com:hoshsadiq/dot_files

Conflicts:
	.profile