Creada una nueva branch
Poniendo un readme chistoso
Agregado bootstrap, modificados los css base, armada una estructura
Merge branch 'design' of https://github.com/shishigami/mascotas

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/perros/index.html.erb
merging design