linux locally changed.
Merge branch 'master' of https://github.com/yuchan/dotfiles

Conflicts:
	.bash_profile
	.bashrc