p
asdfMerge branch 'master' of https://github.com/corehello/mindwiki

Conflicts:
	.gitignore