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

Conflicts:
	.gitignore
gitignore
make secret key
make secret key
new settings.py
settings.py
settings.py
remove settings.py
add settings.py
Merge branch 'master' of https://github.com/pahkey/wikidocs