gitignore change
Merge branch 'master' of https://github.com/dibrito/testerepo

Conflicts:
	.gitignore