bump version
Merge branch 'master' of github.com:Vincent-Zhe-Zhang/dotfiles

Conflicts:
	.bash_aliases
	.bash_profile
	.bashrc
	.gitconfig