* Renamed mergeEffects to make purpose of function more clear
* Extended the comment on sorting the arrays of effects.
* Added "structure" to denied word of DPS calculation to avoid that wrong DPS are calculated for Coco's Power Gloves
* Refactored getActiveSteps to use upgrades.map()
trailing spaces
Merge branch 'r0estir0bbe-refactor-updateEffects'
Merge pull request #16 from r0estir0bbe/issue16

Remove Coco's Power Glove DPS
* Merged master with damage-stages