fisxing merge issues
starting to add fake data
putting fake data, need to pull more fake data
biz (graphs compile and run, but need to be redesigned) and map (map not worky yet)
biz (graphs compile and run, but need to be redesigned) and map (map not worky yet)
FIxed intent logic mixup (cherry picked from commit c726d4a)
Fix then pull ds
Fixing files
(cherry picked from commit 1d10f67)
Adding back the android jar file
(cherry picked from commit 4c1772f)
Fixed bg
(cherry picked from commit 9449c1b)
Think this should be good...
Merge remote-tracking branch 'origin/master'

* origin/master:
  Still trying to fix things up
  Fixed bg
  Added bg
  Added bg
  Added bg
  Added bg
  Adding background image
  Adding back the android jar file
  Fixing files

Conflicts:
	.classpath
	gen/edu/berkeley/cs160/qUp/R.java
	src/edu/berkeley/cs160/qUp/activities/premium/ReservationForm.java
Think this should be good...