Merge branch 'master' of C:\Users\Matthijs\AndroidStudioProjects\InstaSwaggify with conflicts.
Merge remote-tracking branch 'origin/master'
'textview' and 'switch' switched