fix 1.txt  / 2
fix 1.txt  / 3
1.txt / +1
1
Merge branch 'master' of github.com:simpleadm/test
more lines / 2
3.txt added
new feature 4
new feature 5
new feature / 2.txt fix
Merge branch 'feature/1' of github.com:simpleadm/test into feature/1