Textfile

making of teaser
Merge branch 'master' of https://github.com/cloudbuster/latex-dissertation

Conflicts:
	follow-the-script.aux
	main.pdf
	main.synctex.gz
	main.toc