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

Conflicts:
	app/views/welcome/graduates.html.haml
sara-name
sara-name
Merge pull request #6 from railsgirlsnola/sara-name

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