Update
deleted config filen
Update guide
Update guide
Merge branch 'master' of https://github.com/Kennethhole/guide

Conflicts:
	docs/conf.py
	docs/index.rst