added target/ folder as gitignore
completed task 2.1
completed task 2.2
create notes in feature3
Merge branch 'feature3'

Conflicts:
	feature3.txt
add 3.1