mapping
Merge branch 'master' of github.com:sreeharsha-m/vim-ikijournal

Conflicts:
	plugin/ikijournal.vim