sam navoz
Merge branch 'master' of https://github.com/alekseybobkov/test-project

Conflicts:
	index.html