added animation
Merge branch 'master' of https://github.com/sherrywong/qUp

# By sherrywongls
# Via sherrywongls
* 'master' of https://github.com/sherrywong/qUp:
  Fixed merge issues
Merge remote-tracking branch 'origin/master'

* origin/master:
  Fixed up date selection for the qpon page

Conflicts:
	gen/edu/berkeley/cs160/qUp/R.java
biz (graphs compile and run, but need to be redesigned) and map (map not worky yet)