modified
Merge branch 'master' of github.com:winsphinx/books

Conflicts:
	tmp/.vimrc
mod