starting github widget
resolving merge conflicts
resolving merge conflict in gemfile
Merge pull request #6 from gatkin/githubwidget

Githubwidget