test.2 modified
Merge branch 'remote_branch-1'
Merge branch 'master' of github.com:preisner/GitTest
Merge pull request #2 from RaptorSoft/master

modified fon forked branch
change origin/master
Merge branch 'master' of github.com:preisner/GitTest
Merge remote-tracking branch 'mainsource/master'