Updated functions
Merge branch 'master' of github.com:NatashaHull/AppAcademyProjects

Need another merge