functions 101
Merge pull request #7 from adamdiy/master

functions 101