m3
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/progress.pdf
Merge branch 'master' of https://github.com/CE-KMITL-OOAD-2014/Daily-exercise-log