create text2
edit text1
Merge branch 'master' of github.com:WintyBadass/GitTest
Merge branch 'test'