Fixed nasty this problem.
Forgot what I did... it was a lot.
Merge branch 'master' of https://github.com/DeKugelschieber/letsgamedev-challenge3.git