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

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