railsgirlsnola/railsgirls_nola — pull request #6 by saratexas (2014-09-20 16:54:53+00:00)
Title: Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_no...

...la

Conflicts:
app/views/welcome/graduates.html.haml