It's not much but it's something #14/88
Resolve conflicts
Merge pull request #4 from mannol/#newircforfightingagainstkikels1488

It's not much but it's something #14/88