first file
add a line
Merge branch 'master' of github.com:swiftwolff/GitHubTesting

This is the start of github testing