Merge branch 'master' of https://github.com/priyankagj/Winston-Salem-Greenways

Conflicts:
	WinstonSalemGreenways/bin/WinstonSalemGreenways.apk
	WinstonSalemGreenways/bin/classes.dex
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/Greenway.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/GreenwayMap$1.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/GreenwayMap.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/HelloItemizedOverlay$1.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/HelloItemizedOverlay.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/R$drawable.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/R$id.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/R$layout.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/R$menu.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/R$raw.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/R$string.class
	WinstonSalemGreenways/bin/classes/com/winstonsalem/greenways/R$style.class
	WinstonSalemGreenways/bin/resources.ap_
	WinstonSalemGreenways/gen/com/winstonsalem/greenways/R.java
	WinstonSalemGreenways/src/com/winstonsalem/greenways/Greenway.java
	WinstonSalemGreenways/src/com/winstonsalem/greenways/GreenwayMap.java
	WinstonSalemGreenways/src/com/winstonsalem/greenways/HelloItemizedOverlay.java

Signed-off-by: Priyanka Jalisatgi <priyankagj@gmail.com>
31/03