Please work
Merge remote-tracking branch 'origin/master'

Conflicts:
	Docs/Testing Docs
Please work
Please work, scrub
Merge pull request #1 from MatthewBrock/MaxTest

Max test