ss
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
dd
е
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java