did something
Merge branch 'master' of https://github.com/geme/carrera-ki
fixed conflict