Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_nola

Conflicts:
app/views/welcome/graduates.html.haml
Add my team members' names to graduate list 2014