Merge pull request #1 from davidhoo/dev

Dev done
merged from dev
merged from dev
merged from dev
add exercise-loop-and-functions
completed func