fixing ignores
first cut
Merge branch 'develop'
Merge branch 'master' of ssh://github.com/KIRBXx/TRMedia