First commit
Merge https://github.com/martons/sp-guidance

Conflicts:
	.gitignore