need to fix buttons. screwed up their scaling when i made the
backgrounds transparent. Page links are now fully working and start new
blank activites
fixed button stretching
fixed button stretching
Merge branch 'cole'

Conflicts:
	UCSCBusBuddy/AndroidManifest.xml
	UCSCBusBuddy/bin/AndroidManifest.xml
	UCSCBusBuddy/bin/UCSCBusBuddy.apk
	UCSCBusBuddy/bin/classes.dex
	UCSCBusBuddy/bin/classes/com/example/ucscbusbuddy/MainActivity.class
	UCSCBusBuddy/bin/classes/com/example/ucscbusbuddy/R$string.class
	UCSCBusBuddy/bin/classes/com/example/ucscbusbuddy/R$style.class
	UCSCBusBuddy/bin/dexedLibs/android-support-v4-0dc16168ebe9f436ac5da9d397b3a771.jar
	UCSCBusBuddy/bin/res/crunch/drawable-hdpi/mybutton_normal.9.png
	UCSCBusBuddy/bin/resources.ap_
	UCSCBusBuddy/gen/com/example/ucscbusbuddy/R.java
	UCSCBusBuddy/res/layout/activity_bus_schedule.xml
	UCSCBusBuddy/res/layout/activity_closest_stop.xml
	UCSCBusBuddy/res/layout/activity_main.xml
	UCSCBusBuddy/res/layout/activity_select_stop.xml
	UCSCBusBuddy/res/values/strings.xml
	UCSCBusBuddy/src/com/example/ucscbusbuddy/BusScheduleActivity.java
	UCSCBusBuddy/src/com/example/ucscbusbuddy/ClosestStopActivity.java
	UCSCBusBuddy/src/com/example/ucscbusbuddy/MainActivity.java
	UCSCBusBuddy/src/com/example/ucscbusbuddy/SelectStopActivity.java