Attempting to link location off of link
Merge branch 'master' of https://github.com/RSWSMUGirl2016/SMU_Nav
function for linking events to map, not working though
Merge branch 'master' of https://github.com/RSWSMUGirl2016/SMU_Nav

Conflicts:
	js/main.js