Trying to fix the directions.

Cannot get directions after clearing the first directions.
Merge branch 'master' of https://github.com/RSWSMUGirl2016/SMU_Nav

Conflicts:
	android/SMU_Nav/.classpath
	android/SMU_Nav/.project
	android/SMU_Nav/.settings/org.eclipse.jdt.core.prefs
	android/SMU_Nav/AndroidManifest.xml
	android/SMU_Nav/bin/AndroidManifest.xml
	android/SMU_Nav/bin/R.txt
	android/SMU_Nav/bin/classes/com/google/android/gms/R$attr.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R$color.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R$drawable.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R$id.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R$integer.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R$string.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R$style.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R$styleable.class
	android/SMU_Nav/bin/classes/com/google/android/gms/R.class
	android/SMU_Nav/bin/dexedLibs/android-support-v4-edab1da500d62928ec47924664dce19f.jar
	android/SMU_Nav/bin/dexedLibs/google-play-services-a416f059c77a9cf94d68387008c1e443.jar
	android/SMU_Nav/bin/dexedLibs/google-play-services_lib-9b62aa68db629c77cc0c9490b03ef6a0.jar
	android/SMU_Nav/bin/jarlist.cache
	android/SMU_Nav/bin/res/crunch/drawable-hdpi/ic_launcher.png
	android/SMU_Nav/bin/res/crunch/drawable-mdpi/ic_launcher.png
	android/SMU_Nav/bin/res/crunch/drawable-xhdpi/ic_launcher.png
	android/SMU_Nav/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	android/SMU_Nav/gen/com/example/smu_nav/BuildConfig.java
	android/SMU_Nav/gen/com/google/android/gms/R.java
	android/SMU_Nav/ic_launcher-web.png
	android/SMU_Nav/libs/android-support-v4.jar
	android/SMU_Nav/proguard-project.txt
	android/SMU_Nav/project.properties
	android/SMU_Nav/res/drawable-hdpi/ic_launcher.png
	android/SMU_Nav/res/drawable-mdpi/ic_launcher.png
	android/SMU_Nav/res/drawable-xhdpi/ic_launcher.png
	android/SMU_Nav/res/drawable-xxhdpi/ic_launcher.png
	android/SMU_Nav/res/menu/main.xml
	android/SMU_Nav/res/values-v11/styles.xml
	android/SMU_Nav/res/values-v14/styles.xml
	android/SMU_Nav/res/values-w820dp/dimens.xml
	android/SMU_Nav/res/values/dimens.xml
	android/SMU_Nav/res/values/strings.xml
	android/SMU_Nav/res/values/styles.xml