n
Merge branch 'master' of https://github.com/SimonTakman/TDA367

Conflicts:

Mouseophonic/app/src/main/java/com/edit/mouseophonic/app/ConnectActivity
.java