data2chart
Merge branch 'master' of https://github.com/bornik/distributed-computing

Conflicts:
	public/web-client.html