Merge branch 'master' of github.com:IrisGaleano/herosinatra
Merge branch 'master' of github.com:BorjaMartin/herosinatra
Update berserker.rb