too much for today
Merge branch 'master' of https://github.com/m-generala/Game-Dev-2014