Initial Commit
Yeah!
heroku
Ahora anda
yey!
Funca!
Merge branch 'master' of heroku.com:veterinaria

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
Ahora si anda
asd
OK
a
Ruby 2.0.0 preview on Heroku
asdas
yeah
as
ahora anda bien
initial commit