navigate activity connect intent to camera
clickable route
Adding route info activity and connecting to camera view intents
fixed resume camera bug
dddd
Merge remote-tracking branch 'origin/itaiLastBranch'

Conflicts:
	ClimbXpert/src/com/example/climbxpert/CameraViewActivity.java
debug true
Merge branch 'master' of https://github.com/astrut12/ClimbXpert_REPO.git

Conflicts:
	ClimbXpert/src/com/example/climbxpert/CameraViewActivity.java
now they are there!!!!!!!!!!!!!!
route fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ClimbXpert/res/values/strings.xml
Strings