Merge branch 'master' of /Users/marlenakauer/AndroidStudioProjects/WMbuild1 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/marlenakauer/wmbuild1/QRscannerPage.java
open camera code
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/marlenakauer/wmbuild1/QRscannerPage.java
Merge remote-tracking branch 'origin/master'
open camera code