Conflict resolution
Merge branch 'master' of https://github.com/AlleLustWillEwigkeit/twotowers.git