Merge branch 'master' of C:\Users\louka\AndroidStudioProjects\Test3 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/res/values/strings.xml
	build/intermediates/model_data.bin
	local.properties
Louka
Merge remote-tracking branch 'origin/master'