adf
Merge branch 'master' of https://github.com/hahahaa/stereo2013
Integrated half of Kai's and My code
Merge branch 'master' of https://github.com/hahahaa/stereo2013