add alias
Merge branch 'vimrc'
add python. if/for
Merge branch 'doc'