Change file2.txt
Merge branch 'develop' of github.com:droghetti/gstest into develop