change2
Merge branch 'master' of https://github.com/MrRamsoh/testingshit

Conflicts:
	shit.txt