0000000000000000000000000000000000000000 923735e5b41a01e9c3cc056f8da37f6ed0f0c8b2 Angela Sheu <angelasheu.us@gmail.com> 1428288508 -0700	commit (initial): Initial commit
923735e5b41a01e9c3cc056f8da37f6ed0f0c8b2 1d411bca498e6e1e2beb7cce9bbc2be030dec476 Angela Sheu <angelasheu.us@gmail.com> 1428344948 -0700	commit: Send time updates to phone with URL as identifier
1d411bca498e6e1e2beb7cce9bbc2be030dec476 f9654dec41a705760375033aa9ba07dc6447239d Angela Sheu <angelasheu.us@gmail.com> 1428615943 -0700	commit (merge): resolve merge conflicts
f9654dec41a705760375033aa9ba07dc6447239d e055a10a63905e1f56d5eddf12cefcdce7bd847d Angela Sheu <angelasheu.us@gmail.com> 1428616413 -0700	commit: Add back code that communicates with phone
e055a10a63905e1f56d5eddf12cefcdce7bd847d 0a179446f1e2f3552fda290040083e8a7edadf87 Angela Sheu <angelasheu.us@gmail.com> 1428623282 -0700	commit: unlock task finished
0a179446f1e2f3552fda290040083e8a7edadf87 4d9db7caa53c55c48be2729560dffc56797fd9a2 Angela Sheu <angelasheu.us@gmail.com> 1428882759 -0700	commit: configuring screen, message passing between phone and device
4d9db7caa53c55c48be2729560dffc56797fd9a2 c15f4bbdef9cfec139e1f42c1ba76113109a9c18 Angela Sheu <angelasheu.us@gmail.com> 1428884100 -0700	commit: tweaks to UI
c15f4bbdef9cfec139e1f42c1ba76113109a9c18 514d7bced27787fa2ad1f278c8a8a63c86fa26ef Angela Sheu <angelasheu.us@gmail.com> 1429043375 -0700	merge angela: Fast-forward
514d7bced27787fa2ad1f278c8a8a63c86fa26ef 4fc8845c0326d824770c791d5ed92a64edc772fe Angela Sheu <angelasheu.us@gmail.com> 1429744397 -0700	commit: Expand interface, add configuration options
4fc8845c0326d824770c791d5ed92a64edc772fe 67cbc767c43284d2a9df7a7c80a238300cb3d613 Angela Sheu <angelasheu.us@gmail.com> 1429746345 -0700	commit: Send update to phone upon config update
67cbc767c43284d2a9df7a7c80a238300cb3d613 dfade54dbb97a4c3739f133810f75a7203049c9a Angela Sheu <angelasheu.us@gmail.com> 1429748107 -0700	commit: add get method for config settings
dfade54dbb97a4c3739f133810f75a7203049c9a dabc401f15591525806d26299f92cbb51b1a5e10 Angela Sheu <angelasheu.us@gmail.com> 1429830611 -0700	commit: it says I modified something so I'm committing
dabc401f15591525806d26299f92cbb51b1a5e10 43ac43a3c1c770cc48b3607d22e1d104561fcc30 Angela Sheu <angelasheu.us@gmail.com> 1430228909 -0700	commit: Config to change machine to dryer
43ac43a3c1c770cc48b3607d22e1d104561fcc30 f7fee1b430d5de7b3f1b8338eb8da3065ba86955 Angela Sheu <angelasheu.us@gmail.com> 1430938584 -0700	commit: receive message from app and update totalTime based on request text
