testing adoc
Merge branch 'master' of http://github.com/fx57/dotfiles

Conflicts:
	wiki/Second-page.asciidoc