renamed index.html
gitignore changing
Merge branch 'master' of https://github.com/bornik/distributed-computing

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/bornik/distributed-computing

Conflicts:
	.idea/workspace.xml