Test commit
rollback
First attempt
Merge branch 'master' of https://github.com/ivoivanov/MyTestRepository

Conflicts:
	.gitignore