Fixed Merge Conflicts

After merging our work together, the map no longer worked. Somehow the JavaScript for the map disappeared. That has been added back now.
