deleted duplicate name
Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_nola
resolve merge conflict
Add social link and fix merge conflicts
Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_nola