.
Merge branch 'master' of https://github.com/shanqi/git_3dv14_agmatch

Conflicts:
	algorithms.tex