v21
Merge branch 'master' of https://github.com/LadaAnastasiia/Sml360_IPhone

Conflicts:
	index.html