Add Select Gas option before calculating route
Resolve Merge Conflicts
Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/CheapGasFinder

Conflicts:
	app/src/main/java/edu/csuchico/cheapgasfinder/CreateRouteActivity.java
	app/src/main/res/values/strings.xml