Oncombat korjattu
Merge branch 'master' of github.com:TrashTeam/platform