Further edits to the challenge map
Final challenge map linked to C++
Merging map changes for final challenge