Removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/welcome/graduates.html.haml
Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_nola

Conflicts:
	app/views/welcome/graduates.html.haml
Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_nola

Conflicts:
	app/views/welcome/graduates.html.haml
Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_nola