N/A
Merge branch 'master' of https://github.com/ECSAS-3/WordCloud

Conflicts:
	routes/index.js