removed stuff
Merge branch 'master' of https://github.com/antsorin/testgit1
local
Merge branch 'master' of https://github.com/antsorin/testgit1

Conflicts:
	file2.txt
resolved file2 conflicts