stash
Merge branch 'master' of https://github.com/ysonggit/proposal

Conflicts:
	slides.pdf
	slides.tex
	videos/clutter_dbrect.mp4
	videos/clutterdbrect.mp4
	videos/dbrect.mp4