added github ribbon
merge upstream changes
Merge pull request #7 from therewasaguy/master

github ribbon