11/29/2014 Order Placement Finished
11/29/2014 Order Track Complete
11/29/2014 Order Track Complete
12/1/2014 RestaurantClass Refined
12/4/2014
12/4/2014
Merge pull request #2 from 54wang17/development

common merge
CRLF to LF
after conflict
Merge pull request #69 from danuzclaudes/development

12/4/2014 Master - Development
Merge pull request #3 from danuzclaudes/master

12/4/2014 chongrui - Master