logo london
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.sass
red navbar
Merge pull request #27 from hundred/master

Rails Girls London Logo