marcins changes
Merge branch 'master' of https://github.com/jazminschroeder/tdgit.git