Fight
Merge branch 'master' of https://github.com/henrikjonhed/cprog3
fight almost complete