Added: Feature x2
Merge branch 'master' of https://github.com/vbakke/Test

Conflicts:
	File2.txt