changed
Merge branch 'master' of github.com:ammeyjohn/OpenTrends
使用MDwiki作为展示页面
Merge branch 'master' of github.com:ammeyjohn/OpenTrends

Conflicts:
	doc/js-chart.md
	doc/js-visualization.md
	index.md
	navigation.md