TASK 3: Added 2nd type boundary conditions
TASK 3: Added 3rd boundary condition

Note that q_w = 0 here.
Merge remote-tracking branch 'origin/master'

Conflicts:
	task3.py