Adding everything...
Merge branch 'master' of https://github.com/davo/tdmg12