commit
Merge branch 'master' of github.com:DavidKlassen/tizen-fight