git. ps1. config
Merge branch 'master' of github.com:guneysus/rcfiles

Conflicts:
	.profile