test1 committed through Git Bash.
1234
123
213
1331
tidoje
1
2
3
4
123145
1241542115
15135311
15135311
Merge branch 'testing'

Conflicts:
	test2
Merge branch 'master' of http://github.com/devcken/gittest