Merge branch 'master' of https://github.com/jefdaj/jeffwiki

Conflicts:
	.gitignore
	README.md
Merge branch 'master' of https://github.com/jefdaj/jeffwiki

Conflicts:
	README.md