I can't spell
Minor tweaks
Whoops extra comma. sorryaboutit
Merge branch 'master' of github.com:jquerydc/gitworkshop
added a villain
added a new awesome TV series title
Changed villains.json file for git workshop
adding a superhero!
Message to associate
Merge branch 'master' of https://github.com/kylehill/gitworkshop
Merge branch 'master' of https://github.com/kylehill/gitworkshop
merged changes
Merge branch 'master' of https://github.com/kylehill/gitworkshop
Merge branch 'master' of https://github.com/kylehill/gitworkshop
merged
Merge branch 'master' of https://github.com/kylehill/gitworkshop
adding a villain
fixing merge conflict
Added a little Zeppelin
Added some Neal Stephenson