good so far
Merge branch 'master' of https://github.com/ysonggit/proposal

Conflicts:
	slides.pdf