Merge branch 'master' of C:\Users\Rik\Documents\GitHub\Quit with conflicts.
aanpassing in database
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/amaze/quit/app/SetupBrandAmount.java
Merge remote-tracking branch 'origin/master'
aanpassing in database