Updated GUI
Merge branch 'master' of https://github.com/gbaby23/BusRoute
Updated GUI
Updated GUI
Merge branch 'master' of https://github.com/gbaby23/BusRoute

Conflicts:
	BusRoute/res/layout/activity_route_planner.xml
	BusRoute/src/com/example/busroute/RoutePlannerActivity.java