.bashrc
.functions.sh
.gitignore_for_all
.localpath.sh
.vimperatorrc
.vimrc, from cygwin
.bashrc
.vimperatorrc
.vimrc, from cygwin
Merge remote-tracking branch 'origin/master'