Merge pull request #4 from GameEngineKoblenz/master

update own repo
Merge pull request #103 from MadeleineKolb/master

comment - how to expand inputmaps
added NormalMapping

Endlich
Merge pull request #105 from NicolasKlee/master

added NormalMapping
Merge pull request #106 from JanBTG/master

Merge pull request #4 from GameEngineKoblenz/master
ver
Revert "ver"

This reverts commit 710c44a4325365e3563562d4bd698e13e09cd607.
Merge branch 'master' of https://github.com/MadeleineKolb/GeKo