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

Conflicts:
	sqla.log
	sqla.pdf
	sqla.synctex.gz
	sqla.tex

	new file:   filename.py
	modified:   sqla.log
	new file:   sqla.pyg
	modified:   sqla.tex