add calender
merge .vimrc