added new logo and added some height responses
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.sass
	app/views/pages/index.slim