gc - adding notes for week 7 lectures and Water Pouring problem in lecture 5.
gc - adding assignment for bloxorz
Merge branch 'master' of github.com:gregconant/func-scala-2013

Conflicts:
	progfun/.worksheet/src/week7.caseStudyWaterPouringProblem05.scala
	progfun/bin/week7/caseStudyWaterPouringProblem05.sc
	progfun/src/week7/caseStudyWaterPouringProblem05.sc