asd
Merge branch 'master' of github.com:xianny/guide-dog

Conflicts:
	app/views/layout.erb
	public/stylesheets/application.css