some function stuff?
Merge branch 'master' of github.com:nadia26/nadiaveronikaminiproject