Docs Update
Merge branch 'master' of github.com:prggmr/XPSPL

Conflicts:
	docs/index.rst