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

Conflicts:
	db_config.js
	web.js
Merge branch 'master' of https://github.com/bornik/distributed-computing
Merge branch 'master' of https://github.com/bornik/distributed-computing

Conflicts:
	db_config.js
	web.js