adding new feature
new master changes

Conflicts:
	2.txt
new master changes 2
super new master changes
MASTER
new feature 2

Conflicts:
	1.txt
	2.txt

Conflicts:
	1.txt
	2.txt
aaaand new feature

Conflicts:
	2.txt
updated 1.txt
more changes to 1
new file and updated 2 from master
3 is updated frm master
Merge branch 'newbranch'

Conflicts:
	1.txt