Merge branch 'pr/1'

Conflicts:
Rechner/src/com/example/rechner/MainActivity.java