Merge pull request #2 from MoveLife/ThomasMaurer

Thomas maurer, nee
Opruiming
Opruiming
Opruiming
Project
Project4.iml
button updates
Button toegevoegd
new switch toegoegd
button update
Nieuwe build
Merge branch 'master' into ThomasMaurer

Conflicts:
	app/app.iml
	app/build.gradle
	app/proguard-rules.txt
	app/src/main/AndroidManifest.xml
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/menu/main.xml
	app/src/main/res/values/dimens.xml