Merge pull request #1 from rogerskw/master

Add githubfile.txt
Moved around some lines in githubFile.txt
Merged testbranch
Merge pull request #3 from rogerskw/rc

Added a line to the githubfile.txt
Merge pull request #4 from rogerskw/testbranch

Testbranch