Merge pull request #1 from rogerskw/master

Add githubfile.txt
Moved around some lines in githubFile.txt
Merged testbranch