Edits
Merge branch 'master' of https://github.com/garysieling/git-solr-talk