doc 4
Merge branch 'master' of https://github.com/tianshiz/raven_master

Conflicts:
	.~lock.KBAI-Fall2014-MidTermExam3.odt#
	KBAI-Fall2014-MidTermExam3.odt
conf