Update .hound.yml
styled the nav bar
Merge pull request #26 from LaunchAcademy/style_nav_bar

Style nav bar
Merge branch 'master' of github.com:LaunchAcademy/neighborhoods into carrierwave

Conflicts:
	app/views/layouts/application.html.erb
started fixing line errors
Merge branch 'carrierwave' of github.com:LaunchAcademy/neighborhoods into carrierwave

Conflicts:
	app/uploaders/avatar_uploader.rb
	app/views/layouts/application.html.erb
	spec/features/avatar_functionality_spec.rb