first commit
filled git ignore
added target to be ignored
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
test