Basic commit
Merge branch 'master' of https://github.com/KoPaB/Ninja-vs-Trolls.git