2 functions added.
blah
Merge branch 'master' of https://github.com/Stefferp/team2