some changes
Merge branch 'master' of github.com:novalis111/.my_rc

Conflicts:
	.bash_profile
	setup.sh