Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
calcit lab starting point
Basic and Advanced functions - ready for homework
homework done
Merge pull request #18 from louiechristie/master

Week 1, day 2, homework