coding standards
Merge branch 'master' of github.com:dereuromark/transifex
Merge pull request #5 from dereuromark/master

Master