asdasdasd
Merge branch 'master' of github.com:guneysus/rcfiles

Conflicts:
	.bashrc
	.lessfilter
	bash.txt
	bin/colordiff
	bin/idiff
asdasdas:wq