priya
Merge branch 'master' of https://github.com/hgupta2/WinstonSalemGreenways

Conflicts:
	bin/WinstonSalemGreenways.apk
	bin/classes.dex
	bin/classes/com/example/greenways/DescFragment$1.class
	bin/classes/com/example/greenways/DescFragment.class
	bin/classes/com/example/greenways/GreenwayList.class
	bin/classes/com/example/greenways/GreenwayListFragment.class
	bin/classes/com/example/greenways/GreenwayMap.class
	bin/classes/com/example/greenways/Header.class
	bin/classes/com/example/greenways/R$layout.class
	bin/classes/com/example/greenways/R$menu.class
	bin/classes/com/example/greenways/R$raw.class
	bin/classes/com/example/greenways/R$string.class
	bin/classes/com/example/greenways/R$style.class
	bin/classes/com/example/greenways/R$styleable.class
	bin/classes/com/example/greenways/Weather.class
	bin/classes/com/google/android/gms/R$drawable.class
	bin/classes/com/google/android/gms/R$id.class
	bin/classes/com/google/android/gms/R$layout.class
	bin/classes/com/google/android/gms/R$menu.class
	bin/classes/com/google/android/gms/R$raw.class
	bin/classes/com/google/android/gms/R$string.class
	bin/classes/com/google/android/gms/R$style.class
	bin/classes/com/google/android/gms/R$styleable.class
	bin/resources.ap_
	gen/com/example/greenways/R.java
	gen/com/google/android/gms/R.java
	res/layout/description.xml
	res/layout/direction_desc.xml
	src/com/example/greenways/DescFragment.java
	src/com/example/greenways/GreenwayMap.java

Signed-off-by: Priyanka Jalisatgi <priyankagj@gmail.com>
changes