empty commit message
Merge branch 'master' of https://github.com/ricky155030/configuration

Conflicts:
	.bashrc
	.vimrc