new file
more changes
more tests
new file
Revert "new file"

This reverts commit 6517506a2a9a0f34c83b97738f3a1095d901d70c.
Revert "Revert "new file""

This reverts commit 4118012b12bfa05250fffbc3b985a899e32b797b.
changes to anotherfile.txt
edit testfile.txt
new info from branch
new feature
Merge branch 'master' into gl_new
 new file
new feature hells yea
master change, hell yuea!
Merge branch 'new-feature'