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

Conflicts:
	feature3.txt