Added tab menu to Dog show page
Merge branch 'master' into tabs_on_dog_page

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
Merge pull request #3 from perronapp/tabs_on_dog_page

Tabs on dog page
Fix Jaime Bug
Merge pull request #5 from perronapp/tabs_on_dog_page

Fix Jaime Bug
Merge branch 'master' into feature-add-avatar-to-dog

Conflicts:
	app/views/dogs/show.html.erb
Merge branch 'master' into feature-add-avatar-to-dog