Finished adding tasks from iphone: schneimd, duffytj
Merge branch 'master' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike