Andrew & Shiya - Work plan v1
Merge pull request #74 from andrewyuan/andrewyuan

Andrew & Shiya - Work plan v1