Fixed bad conflict resolution when I merged feature-newice with feature-ice
resolved conflict that was none
Merge pull request #90 from lekomin/feature-rsi

Feature rsi