Naam in dashboard
Merge branch 'master' of https://github.com/timdujardin/workoutapp

Conflicts:

WorkoutApp/app/src/main/java/be/howest/nmct3/workoutapp/MainActivity.jav
a