knop
knop 2
knop 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/res/layout/activity_home.xml
knop 4