added some test text for git pull
Import from upstream
Updates
Test commit

Trying to get Github working again
Merge pull request #97 from Lerogero/master

Fixing Grant's Github