grote if statement in mainActivity naar case statement
Merge remote-tracking branch 'origin/master'