Q15
Merge branch 'master' of github.com:soodaowhui/lesson

Conflicts:
	MachineLearningFoundations/homework1/Q15