modified:   sqla.log
	modified:   sqla.pdf
Merge branch 'master' of https://github.com/mnothic/tex-slides

Conflicts:
	sqla.log
	sqla.pdf

	new file:   python-logo.png
	modified:   sqla.aux
	modified:   sqla.dvi
	modified:   sqla.log
	modified:   sqla.nav
	modified:   sqla.synctex.gz
	modified:   sqla.tex
	modified:   sqla.vrb
	modified:   sqla.log
	modified:   sqla.pdf