modificado gitignore
arreglado gitignore
Merge branch 'master' of https://github.com/tagoro9/beats
Merge branch 'master' of https://github.com/tagoro9/beats
Loading Samples from BD
add loaded samples to pattern
Merge branch 'master' of https://github.com/tagoro9/beats
Merge branch 'master' into bd
Lista samples mejorada
player design
Merge remote-tracking branch 'origin/bd'

Conflicts:
	app/app.rb