added data
Merge branch 'gh-pages' of https://github.com/wanderer/nato-diagram into gh-pages

Conflicts:
	map
	map/data