Merge branch 'TablettenTippen'

Conflicts:
code.r