added content
Merge branch 'master' of https://github.com/ubimix/NumaMap

Conflicts:
	data/history.html
	index.js