Updating file2 (Folder 2)
Merge branch 'master' of https://github.com/lethosor/testp1

Conflicts:
	file2.txt