remove merge conflicts
Merge branch 'master' of https://github.com/codingluke/gravitron
add Translations