11
Merge branch 'master' of https://github.com/Bartzlo/TestRepo

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Bartzlo/TestRepo
test ignore