Resolved conflict.
Merge branch 'master' of https://github.com/Makman2/TE3D