local1
del
Merge pull request #1 from vetal2409/master

del
Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	gt.txt