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
Merge pull request #2 from MatthewBrock/Map

Maps are fun
Maps are scratch
Maps are scratch
Maps are Working?
Maps are Working? PLZ
Maps are Working? PLZ
Maps are Working? PLZ
Maps are Working? PLZ