commit

xxxxx
Merge branch 'master' of https://github.com/maitv/ProjectSem1

Conflicts:
	source/index.html
bi conflic