Functions filled in
Merge branch 'master' of https://github.com/juliasets/project1