modified:   aliases
	modified:   bashrc

	modified:   aliases
	modified:   bashrc
	modified:   bashrc
Merge branch 'master' of https://github.com/sennychu/linuxdot

	modified:   bashrc
	modified:   bashrc
	modified:   git-config
Merge branch 'master' of https://github.com/sennychu/linuxdot