Merge branch 'US10'
Merge branch 'US10'
almost done w/ Rewards
lchen59 kwchen3 almost done with Rewards
lchen59 kwchen3 finished the delete
lchen59 kwchen3 finished update
lchen59 kwchen3 need primary_key fields
paulkim6 jcheng26: added new constructor to Rewards.java to handle db
interaction
lchen59 kwchen3 finalized Rewards
finished Rewards Tests
lchen59 kwchen3 finalized tests for Rewards DB and updated Rewards
lchen59 kwchen3 slight changes to testers for Rewards
hlim10 ssong25: Changed Daily Class
hlim10 ssong25 : Modified Habit class
hlim10 ssong25 : todo class modified
hlim10 ssong25 : modified Habit, todo, dailiy class
Merge branch 'US10'
Merge remote-tracking branch 'origin/master' into new_US11
color feature: ssong25, hlim10

color change to habit, todo, daily
color feature: ssong25, hlim10

color change to habit, todo, daily