Merge remote branch 'brandonheato/doc/intro' into develop

Conflicts:
	doc/intro.rst