adding color to simple git and removing local vim file
Merge branch 'master' of github.com:bijancn/bcn_scripts
Merge branch 'master' of github.com:bijancn/bcn_scripts

Conflicts:
	.bashrc