gitignore
Merge branch 'master' of https://github.com/pahkey/wikidocs

Conflicts:
	.gitignore
gitignore