test
Merge branch 'master' of https://github.com/AlexKund/newProject

Conflicts:
	public/index.html
a
m