sync
merge

Conflicts:
	.classpath
	bin/classes/com/example/gtnavigate/R$id.class
	bin/classes/com/example/gtnavigate/R$layout.class
	bin/classes/com/example/gtnavigate/R$menu.class
	bin/classes/com/example/gtnavigate/R$string.class
	bin/classes/com/example/gtnavigate/R$style.class
	gen/com/example/gtnavigate/R.java