Modified text1.txt
Text added by master
Added by dev
Fixed merge conflicts
Another test
Added more
Added more
Added
Merge branch 'development' of https://github.com/cleverrev/git_test into development