dddd
Merge branch 'master' of https://github.com/astrut12/ClimbXpert_REPO.git

Conflicts:
	ClimbXpert/src/com/example/climbxpert/CameraViewActivity.java