Changed some files
Merge branch 'master' of https://github.com/eladnova/TestingGit

Conflicts:
	test-file.html
Removed conflict