Lots of stuff in here, I am not even going to bother with the atomic commits.
Merge branch 'master' of github.com:diegomarquez/game-framework