lapcount, besttime
Merge branch 'master' of https://github.com/geme/carrera-ki

# By sthoden
# Via sthoden
* 'master' of https://github.com/geme/carrera-ki:
  fixed conflict
  academy
  did something
  merged .gitignore file
  extracted python data server