Included outside US
Merge branch 'master' of https://github.com/mkfreeman/info343_map

Conflicts:
	js/data.js