test.2 modified
Merge branch 'remote_branch-1'
Merge branch 'master' of github.com:preisner/GitTest